From: Thierry Parmentelat Date: Tue, 4 Mar 2008 09:03:43 +0000 (+0000) Subject: initial import from onelab svn codebase X-Git-Tag: PLEWWW-PLE.5.0-0~28 X-Git-Url: http://git.onelab.eu/?p=plewww.git;a=commitdiff_plain;h=ba1db01078f414acb4c2280df2ebfd0cabe97b41 initial import from onelab svn codebase --- ba1db01078f414acb4c2280df2ebfd0cabe97b41 diff --git a/CHANGELOG.txt b/CHANGELOG.txt new file mode 100644 index 0000000..decbbf2 --- /dev/null +++ b/CHANGELOG.txt @@ -0,0 +1,542 @@ +// $Id: CHANGELOG.txt 144 2007-03-28 07:52:20Z thierry $ + +Drupal 4.7.3, 2006-08-02 +------------------------ +- fixed security issue (XSS), see SA-2006-011 + +Drupal 4.7.2, 2006-06-01 +------------------------ +- fixed critical upload issue, see SA-2006-007 +- fixed taxonomy XSS issue, see SA-2006-008 +- fixed a variety of small bugs. + +Drupal 4.7.1, 2006-05-24 +------------------------ +- fixed critical SQL issue, see SA-2006-005 +- fixed a serious upgrade related bug. +- fixed a variety of small bugs. + +Drupal 4.7.0, 2006-05-01 +------------------------ +- added free tagging support. +- added a site-wide contact form. +- theme system: + * added the PHPTemplate theme engine and removed the Xtemplate engine. + * converted the bluemarine theme from XTemplate to PHPTemplate. + * converted the pushbutton theme from XTemplate to PHPTemplate. +- usability: + * reworked the 'request new password' functionality. + * reworked the node and comment edit forms. + * made it easy to add nodes to the navigation menu. + * added site 'offline for maintenance' feature. + * added support for auto-complete forms (AJAX). + * added support for collapsible page sections (JS). + * added support for resizable text fields (JS). + * improved file upload functionality (AJAX). + * reorganized some settings pages. + * added friendly database error screens. + * improved styling of update.php. +- refactored the forms API. + * made it possible to alter, extend or theme forms. +- comment system: + * added support for "mass comment operations" to ease repetitive tasks. + * comment moderation has been removed. +- node system: + * reworked the revision functionality. + * removed the bookmarklet code. Third-party modules can now handle + this. +- upgrade system: + * allows contributed modules to plug into the upgrade system. +- profiles: + * added a block to display author information along with posts. + * added support for private profile fields. +- statistics module: + * added the ability to track page generation times. + * made it possible to block certain IPs/hostnames. +- block system: + * added support for theme-specific block regions. +- syndication: + * made the aggregator module parse Atom feeds. + * made the aggregator generate RSS feeds. + * added RSS feed settings. +- XML-RPC: + * replaced the XML-RPC library by a better one. +- performance: + * added 'loose caching' option for high-traffic sites. + * improved performance of path aliasing. + * added the ability to track page generation times. +- internationalization: + * improved Unicode string handling API. + * added support for PHP's multibyte string module. +- added support for PHP5's 'mysqli' extension. +- search module: + * made indexer smarter and more robust. + * added advanced search operators (e.g. phrase, node type, ...). + * added customizable result ranking. +- PostgreSQL support: + * removed dependency on PL/pgSQL procedural language. +- menu system: + * added support for external URLs. +- queue module: + * removed from core. +- HTTP handling: + * added support for a tolerant Base URL. + * output URIs relative to the root, without a base tag. + +Drupal 4.6.6, 2006-03-13 +------------------------ +- fixed bugs, including 4 security vulnerabilities. + +Drupal 4.6.5, 2005-12-12 +------------------------ +- fixed bugs: no critical bugs were identified. + +Drupal 4.6.4, 2005-11-30 +------------------------ +- fixed bugs, including 3 security vulnerabilities. + +Drupal 4.6.3, 2005-08-15 +------------------------ +- fixed bugs, including a critical "arbitrary PHP code execution" bug. + +Drupal 4.6.2, 2005-06-29 +------------------------ +- fixed bugs, including two critical "arbitrary PHP code execution" bugs. + +Drupal 4.6.1, 2005-06-01 +------------------------ +- fixed bugs, including a critical input validation bug. + +Drupal 4.6.0, 2005-04-15 +------------------------ +- PHP5 compliance +- search: + * added UTF-8 support to make it work with all languages. + * improved search indexing algorithm. + * improved search output. + * impose a throttle on indexing of large sites. + * added search block. +- syndication: + * made the ping module ping pingomatic.com which, in turn, will ping all the major ping services. + * made Drupal generate RSS 2.0 feeds. + * made RSS feeds extensible. + * added categories to RSS feeds. + * added enclosures to RSS feeds. +- flood control mechanism: + * added a mechanism to throttle certain operations. +- usability: + * refactored the block configuration pages. + * refactored the statistics pages. + * refactored the watchdog pages. + * refactored the throttle module configuration. + * refactored the access rules page. + * refactored the content administration page. + * introduced forum configuration pages. + * added a 'add child page' link to book pages. +- contact module: + * added a simple contact module that allows users to contact each other using e-mail. +- multi-site configuration: + * made it possible to run multiple sites from a single code base. +- added an image API: enables better image handling. +- block system: + * extended the block visibility settings. +- theme system: + * added new theme functions. +- database backend: + * the PEAR database backend is no longer supported. +- performance: + * improved performance of the forum topics block. + * improved performance of the tracker module. + * improved performance of the node pages. +- documentation: + * improved and extended PHPDoc/Doxygen comments. + +Drupal 4.5.8, 2006-03-13 +------------------------ +- fixed bugs, including 3 security vulnerabilities. + +Drupal 4.5.7, 2005-12-12 +------------------------ +- fixed bugs: no critical bugs were identified. + +Drupal 4.5.6, 2005-11-30 +------------------------ +- fixed bugs, including 3 security vulnerabilities. + +Drupal 4.5.5, 2005-08-15 +------------------------ +- fixed bugs, including a critical "arbitrary PHP code execution" bug. + +Drupal 4.5.4, 2005-06-29 +------------------------ +- fixed bugs, including two critical "arbitrary PHP code execution" bugs. + +Drupal 4.5.3, 2005-06-01 +------------------------ +- fixed bugs, including a critical input validation bug. + +Drupal 4.5.2, 2005-01-15 +------------------------ +- fixed bugs: a cross-site scripting (XSS) vulnerability has been fixed. + +Drupal 4.5.1, 2004-12-01 +------------------------ +- fixed bugs: no critical bugs were identified. + +Drupal 4.5.0, 2004-10-18 +------------------------ +- navigation: + * made it possible to add, delete, rename and move menu items. + * introduced tabs and subtabs for local tasks. + * reorganized the navigation menus. +- user management: + * added support for multiple roles per user. + * made it possible to add custom profile fields. + * made it possible to browse user profiles by field. +- node system: + * added support for node-level permissions. +- comment module: + * made it possible to leave contact information without having to register. +- upload module: + * added support for uploading documents (includes images). +- forum module: + * added support for sticky forum topics. + * made it possible to track forum topics. +- syndication: + * added support for RSS ping-notifications of http://technorati.com/. + * refactored the categorization of syndicated news items. + * added an URL alias for 'rss.xml'. + * improved date parsing. +- database backend: + * added support for multiple database connections. + * the PostgreSQL backend does no longer require PEAR. +- theme system: + * changed all GIFs to PNGs. + * reorganised the handling of themes, template engines, templates and styles. + * unified and extended the available theme settings. + * added theme screenshots. +- blocks: + * added 'recent comments' block. + * added 'categories' block. +- blogger API: + * added support for auto-discovery of blogger API via RSD. +- performance: + * added support for sending gzip compressed pages. + * improved performance of the forum module. +- accessibility: + * improved the accessibility of the archive module's calendar. + * improved form handling and error reporting. + * added HTTP redirects to prevent submitting twice when refreshing right after a form submission. +- refactored 403 (forbidden) handling and added support for custom 403 pages. +- documentation: + * added PHPDoc/Doxygen comments. +- filter system: + * added support for using multiple input formats on the site + * expanded the embedded PHP-code feature so it can be used everywhere + * added support for role-dependant filtering, through input formats +- UI translation: + * managing translations is now completely done through the administration interface + * added support for importing/exporting gettext .po files + +Drupal 4.4.3, 2005-06-01 +------------------------ +- fixed bugs, including a critical input validation bug. + +Drupal 4.4.2, 2004-07-04 +------------------------ +- fixed bugs: no critical bugs were identified. + +Drupal 4.4.1, 2004-05-01 +------------------------ +- fixed bugs: no critical bugs were identified. + +Drupal 4.4.0, 2004-04-01 +------------------------ +- added support for the MetaWeblog API and MovableType extensions. +- added a file API: enables better document management. +- improved the watchdog and search module to log search keys. +- news aggregator: + * added support for conditional GET. + * added OPML feed subscription list. + * added support for , , , , and . +- comment module: + * made it possible to disable the "comment viewing controls". +- performance: + * improved module loading when serving cached pages. + * made it possible to automatically disable modules when under heavy load. + * made it possible to automatically disable blocks when under heavy load. + * improved performance and memory footprint of the locale module. +- theme system: + * made all theme functions start with 'theme_'. + * made all theme functions return their output. + * migrated away from using the BaseTheme class. + * added many new theme functions and refactored existing theme functions. + * added avatar support to 'Xtemplate'. + * replaced theme 'UnConeD' by 'Chameleon'. + * replaced theme 'Marvin' by 'Pushbutton'. +- usability: + * added breadcrumb navigation to all pages. + * made it possible to add context-sensitive help to all pages. + * replaced drop-down menus by radio buttons where appropriate. + * removed the 'magic_quotes_gpc = 0' requirement. + * added a 'book navigation' block. +- accessibility: + * made themes degrade gracefully in absence of CSS. + * grouped form elements using '
' and '' tags. + * added '
\n"; + +} + +/** + * Format a radio button. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: required, return_value, value, attributes, title, description + * @return + * A themed HTML string representing the form item group. + */ +function theme_radio($element) { + _form_set_class($element, array('form-radio')); + $output = ''; + if (!is_null($element['#title'])) { + $output = ''; + } + return theme('form_element', NULL, $output, $element['#description'], $element['#id'], $element['#required'], form_get_error($element)); +} + +/** + * Format a set of radio buttons. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: title, value, options, description, required and attributes. + * @return + * A themed HTML string representing the radio button set. + */ +function theme_radios($element) { + if ($element['#title'] || $element['#description']) { + return theme('form_element', $element['#title'], $element['#children'], $element['#description'], NULL, $element['#required'], form_get_error($element)); + } + else { + return $element['#children']; + } +} + +/** + * Format a password_confirm item. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: title, value, id, required, error. + * @return + * A themed HTML string representing the form item. + */ +function theme_password_confirm($element) { + return theme('form_element', $element['#title'], '
'. $element['#children']. '
', $element['#description'], $element['#id'], $element['#required'], form_get_error($element)); +} + +/* + * Expand a password_confirm field into two text boxes. + */ +function expand_password_confirm($element) { + $element['pass1'] = array('#type' => 'password', '#size' => 12, '#value' => $element['#value']['pass1']); + $element['pass2'] = array('#type' => 'password', '#size' => 12, '#value' => $element['#value']['pass2']); + $element['#validate'] = array('password_confirm_validate' => array()); + $element['#tree'] = TRUE; + + return $element; +} + +/** + * Validate password_confirm element. + */ +function password_confirm_validate($form) { + $pass1 = trim($form['pass1']['#value']); + if (!empty($pass1)) { + $pass2 = trim($form['pass2']['#value']); + if ($pass1 != $pass2) { + form_error($form, t('The specified passwords do not match.')); + } + } + elseif ($form['#required'] && !empty($_POST['edit'])) { + form_error($form, t('Password field is required.')); + } + + // Password field must be converted from a two-element array into a single + // string regardless of validation results. + form_set_value($form['pass1'], NULL); + form_set_value($form['pass2'], NULL); + form_set_value($form, $pass1); + + return $form; +} + +/** + * Format a date selection element. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: title, value, options, description, required and attributes. + * @return + * A themed HTML string representing the date selection boxes. + */ +function theme_date($element) { + $output = '
' . $element['#children'] . '
'; + return theme('form_element', $element['#title'], $output, $element['#description'], $element['#id'], $element['#required'], form_get_error($element)); +} + +/** + * Roll out a single date element. + */ +function expand_date($element) { + // Default to current date + if (!isset($element['#value'])) { + $element['#value'] = array('day' => format_date(time(), 'custom', 'j'), + 'month' => format_date(time(), 'custom', 'n'), + 'year' => format_date(time(), 'custom', 'Y')); + } + + $element['#tree'] = TRUE; + + // Determine the order of day, month, year in the site's chosen date format. + $format = variable_get('date_format_short', 'm/d/Y'); + $sort = array(); + $sort['day'] = max(strpos($format, 'd'), strpos($format, 'j')); + $sort['month'] = max(strpos($format, 'm'), strpos($format, 'M')); + $sort['year'] = strpos($format, 'Y'); + asort($sort); + $order = array_keys($sort); + + // Output multi-selector for date + foreach ($order as $type) { + switch ($type) { + case 'day': + $options = drupal_map_assoc(range(1, 31)); + break; + case 'month': + $options = drupal_map_assoc(range(1, 12), 'map_month'); + break; + case 'year': + $options = drupal_map_assoc(range(1900, 2050)); + break; + } + $parents = $element['#parents']; + $parents[] = $type; + $element[$type] = array( + '#type' => 'select', + '#value' => $element['#value'][$type], + '#attributes' => $element['#attributes'], + '#options' => $options, + ); + } + + return $element; +} + +/** + * Validates the FAPI date type to stop dates like 30/Feb/2006 + */ +function date_validate($form) { + if (!checkdate($form['#value']['month'], $form['#value']['day'], $form['#value']['year'])) { + form_error($form, t('The specified date is invalid.')); + } +} + +/** + * Helper function for usage with drupal_map_assoc to display month names. + */ +function map_month($month) { + return format_date(gmmktime(0, 0, 0, $month, 2, 1970), 'custom', 'M', 0); +} + +/** + * Helper function to load value from default value for checkboxes + */ +function checkboxes_value(&$form) { + $value = array(); + foreach ((array)$form['#default_value'] as $key) { + $value[$key] = 1; + } + $form['#value'] = $value; +} + +/** + * If no default value is set for weight select boxes, use 0. + */ +function weight_value(&$form) { + if (isset($form['#default_value'])) { + $form['#value'] = $form['#default_value']; + } + else { + $form['#value'] = 0; + } +} + +/** + * Roll out a single radios element to a list of radios, + * using the options array as index. + */ +function expand_radios($element) { + if (count($element['#options']) > 0) { + foreach ($element['#options'] as $key => $choice) { + if (!isset($element[$key])) { + $element[$key] = array('#type' => 'radio', '#title' => $choice, '#return_value' => $key, '#default_value' => $element['#default_value'], '#attributes' => $element['#attributes'], '#parents' => $element['#parents'], '#spawned' => TRUE); + } + } + } + return $element; +} + +/** + * Format a form item. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: title, value, description, required, error + * @return + * A themed HTML string representing the form item. + */ +function theme_item($element) { + return theme('form_element', $element['#title'], $element['#value'] . $element['#children'], $element['#description'], $element['#id'], $element['#required'], $element['#error']); +} + +/** + * Format a checkbox. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: title, value, return_value, description, required + * @return + * A themed HTML string representing the checkbox. + */ +function theme_checkbox($element) { + _form_set_class($element, array('form-checkbox')); + $checkbox = ''; + + if (!is_null($element['#title'])) { + $checkbox = ''; + } + + return theme('form_element', NULL, $checkbox, $element['#description'], $element['#id'], $element['#required'], form_get_error($element)); +} + +/** + * Format a set of checkboxes. + * + * @param $element + * An associative array containing the properties of the element. + * @return + * A themed HTML string representing the checkbox set. + */ +function theme_checkboxes($element) { + if ($element['#title'] || $element['#description']) { + return theme('form_element', $element['#title'], $element['#children'], $element['#description'], NULL, $element['#required'], form_get_error($element)); + } + else { + return $element['#children']; + } +} + +function expand_checkboxes($element) { + $value = is_array($element['#value']) ? $element['#value'] : array(); + $element['#tree'] = TRUE; + if (count($element['#options']) > 0) { + if (!isset($element['#default_value']) || $element['#default_value'] == 0) { + $element['#default_value'] = array(); + } + foreach ($element['#options'] as $key => $choice) { + if (!isset($element[$key])) { + $element[$key] = array('#type' => 'checkbox', '#processed' => TRUE, '#title' => $choice, '#return_value' => $key, '#default_value' => isset($value[$key]), '#attributes' => $element['#attributes']); + } + } + } + return $element; +} + +function theme_submit($element) { + return theme('button', $element); +} + +function theme_button($element) { + //Make sure not to overwrite classes + if (isset($element['#attributes']['class'])) { + $element['#attributes']['class'] = 'form-'. $element['#button_type'] .' '. $element['#attributes']['class']; + } + else { + $element['#attributes']['class'] = 'form-'. $element['#button_type']; + } + + return '\n"; +} + +/** + * Format a hidden form field. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: value, edit + * @return + * A themed HTML string representing the hidden form field. + */ +function theme_hidden($element) { + return '\n"; +} + +/** + * Format a textfield. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: title, value, description, size, maxlength, required, attributes autocomplete_path + * @return + * A themed HTML string representing the textfield. + */ +function theme_textfield($element) { + $size = $element['#size'] ? ' size="' . $element['#size'] . '"' : ''; + $class = array('form-text'); + $extra = ''; + if ($element['#autocomplete_path']) { + drupal_add_js('misc/autocomplete.js'); + $class[] = 'form-autocomplete'; + $extra = ''; + } + _form_set_class($element, $class); + $output = ''; + return theme('form_element', $element['#title'], $output, $element['#description'], $element['#id'], $element['#required'], form_get_error($element)). $extra; +} + +/** + * Format a form. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: action, method, attributes, children + * @return + * A themed HTML string representing the form. + */ +function theme_form($element) { + // Anonymous div to satisfy XHTML compliance. + $action = $element['#action'] ? 'action="' . check_url($element['#action']) . '" ' : ''; + return '
\n
". $element['#children'] ."\n
\n"; +} + +/** + * Format a textarea. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: title, value, description, rows, cols, required, attributes + * @return + * A themed HTML string representing the textarea. + */ +function theme_textarea($element) { + $class = array('form-textarea'); + if ($element['#resizable'] !== false) { + drupal_add_js('misc/textarea.js'); + $class[] = 'resizable'; + } + + $cols = $element['#cols'] ? ' cols="'. $element['#cols'] .'"' : ''; + _form_set_class($element, $class); + return theme('form_element', $element['#title'], ''. check_plain($element['#value']) .'', $element['#description'], $element['#id'], $element['#required'], form_get_error($element)); +} + +/** + * Format HTML markup for use in forms. + * + * This is used in more advanced forms, such as theme selection and filter format. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: prefix, value, children and suffix. + * @return + * A themed HTML string representing the HTML markup. + */ + +function theme_markup($element) { + return $element['#value'] . $element['#children']; +} + +/** +* Format a password field. +* +* @param $element +* An associative array containing the properties of the element. +* Properties used: title, value, description, size, maxlength, required, attributes +* @return +* A themed HTML string representing the form. +*/ +function theme_password($element) { + $size = $element['#size'] ? ' size="'. $element['#size'] .'" ' : ''; + + _form_set_class($element, array('form-text')); + $output = ''; + + return theme('form_element', $element['#title'], $output, $element['#description'], $element['#id'], $element['#required'], form_get_error($element)); +} + +/** + * Format a weight selection menu. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: title, delta, description + * @return + * A themed HTML string representing the form. + */ +function theme_weight($element) { + for ($n = (-1 * $element['#delta']); $n <= $element['#delta']; $n++) { + $weights[$n] = $n; + } + $element['#options'] = $weights; + $element['#type'] = 'select'; + + return form_render($element); +} + +/** + * Format a file upload field. + * + * @param $title + * The label for the file upload field. + * @param $name + * The internal name used to refer to the field. + * @param $size + * A measure of the visible size of the field (passed directly to HTML). + * @param $description + * Explanatory text to display after the form item. + * @param $required + * Whether the user must upload a file to the field. + * @return + * A themed HTML string representing the field. + * + * For assistance with handling the uploaded file correctly, see the API + * provided by file.inc. + */ +function theme_file($element) { + _form_set_class($element, array('form-file')); + return theme('form_element', $element['#title'], '\n", $element['#description'], $element['#id'], $element['#required'], form_get_error($element)); +} + +/** + * Sets a form element's class attribute. + * + * Adds 'required' and 'error' classes as needed. + * + * @param &$element + * The form element + * @param $name + * Array of new class names to be added + */ +function _form_set_class(&$element, $class = array()) { + if ($element['#required']) { + $class[] = 'required'; + } + if (form_get_error($element)){ + $class[] = 'error'; + } + if (isset($element['#attributes']['class'])) { + $class[] = $element['#attributes']['class']; + } + $element['#attributes']['class'] = implode(' ', $class); +} + +/** + * Remove invalid characters from an HTML ID attribute string. + * + * @param $id + * The ID to clean + * @return + * The cleaned ID + */ +function form_clean_id($id = NULL) { + $id = str_replace('][', '-', $id); + return $id; +} + +/** + * @} End of "defgroup form". + */ diff --git a/includes/image.inc b/includes/image.inc new file mode 100644 index 0000000..cebb648 --- /dev/null +++ b/includes/image.inc @@ -0,0 +1,303 @@ + descriptive title. + */ +function image_get_available_toolkits() { + $toolkits = file_scan_directory('includes', 'image\..*\.inc$'); + + $output = array(); + foreach ($toolkits as $file => $toolkit) { + include_once "./$file"; + $function = str_replace('.', '_', $toolkit->name) .'_info'; + if (function_exists($function)) { + $info = $function(); + $output[$info['name']] = $info['title']; + } + } + $output['gd'] = t('Built-in GD2 toolkit'); + return $output; +} + +/** + * Retrieve the name of the currently used toolkit. + * + * @return String containing the name of the toolkit. + */ +function image_get_toolkit() { + static $toolkit; + if (!$toolkit) { + $toolkit = variable_get('image_toolkit', 'gd'); + $toolkit_file = './includes/image.'.$toolkit.'.inc'; + if ($toolkit != 'gd' && file_exists($toolkit_file)) { + include_once $toolkit_file; + } + elseif (!image_gd_check_settings()) { + $toolkit = false; + } + } + + return $toolkit; +} + +/** + * Invokes the given method using the currently selected toolkit. + * + * @param $method A string containing the method to invoke. + * @param $params An optional array of parameters to pass to the toolkit method. + * + * @return Mixed values (typically Boolean for successful operation). + */ +function image_toolkit_invoke($method, $params = array()) { + if ($toolkit = image_get_toolkit()) { + $function = 'image_'. $toolkit .'_'. $method; + if (function_exists($function)) { + return call_user_func_array($function, $params); + } + else { + watchdog('php', t("The selected image handling toolkit '%toolkit' can not correctly process '%function'.", array('%toolkit' => "$toolkit", '%function' => "$function")), WATCHDOG_ERROR); + return false; + } + } + else { + if ($method == 'settings') { + return image_gd_settings(); + } + } +} + + +/** + * Get details about an image. + * + * @return array containing information about the image + * 'width': image's width in pixels + * 'height': image's height in pixels + * 'extension': commonly used extension for the image + * 'mime_type': image's MIME type ('image/jpeg', 'image/gif', etc.) + * 'file_size': image's physical size (in bytes) + */ +function image_get_info($file) { + if (!is_file($file)) { + return false; + } + + $details = false; + $data = @getimagesize($file); + $file_size = @filesize($file); + + if (isset($data) && is_array($data)) { + $extensions = array('1' => 'gif', '2' => 'jpg', '3' => 'png'); + $extension = array_key_exists($data[2], $extensions) ? $extensions[$data[2]] : ''; + $details = array('width' => $data[0], + 'height' => $data[1], + 'extension' => $extension, + 'file_size' => $file_size, + 'mime_type' => $data['mime']); + } + + return $details; +} + +/** + * Scales an image to the given width and height while maintaining aspect + * ratio. + * + * @param $source The filepath of the source image + * @param $destination The file path of the destination image + * @param $width The target width + * @param $height The target height + * + * @return True or false, based on success + */ +function image_scale($source, $destination, $width, $height) { + $info = image_get_info($source); + + // don't scale up + if ($width > $info['width'] && $height > $info['height']) { + return false; + } + + $aspect = $info['height'] / $info['width']; + if ($aspect < $height / $width) { + $width = (int)min($width, $info['width']); + $height = (int)round($width * $aspect); + } + else { + $height = (int)min($height, $info['height']); + $width = (int)round($height / $aspect); + } + + return image_toolkit_invoke('resize', array($source, $destination, $width, $height)); +} + +/** + * Resize an image to the given dimensions (ignoring aspect ratio). + * + * @param $source The filepath of the source image. + * @param $destination The file path of the destination image. + * @param $width The target width. + * @param $height The target height. + */ +function image_resize($source, $destination, $width, $height) { + return image_toolkit_invoke('resize', array($source, $destination, $width, $height)); +} + +/** + * Rotate an image by the given number of degrees. + * + * @param $source The filepath of the source image + * @param $destination The file path of the destination image + * @param $degrees The number of (clockwise) degrees to rotate the image + */ +function image_rotate($source, $destination, $degrees) { + return image_toolkit_invoke('rotate', array($source, $destination, $degrees)); +} + +/** + * Crop an image to the rectangle specified by the given rectangle. + * + * @param $source The filepath of the source image + * @param $destination The file path of the destination image + * @param $x The top left co-ordinate of the crop area (x axis value) + * @param $y The top left co-ordinate of the crop area (y axis value) + * @param $width The target width + * @param $height The target height + */ +function image_crop($source, $destination, $x, $y, $width, $height) { + return image_toolkit_invoke('crop', array($source, $destination, $x, $y, $width, $height)); +} + +/** + * GD2 toolkit functions + * With the minimal requirements of PHP 4.3 for Drupal, we use the built-in version of GD. + */ + +/** + * Retrieve settings for the GD2 toolkit (not used). + */ +function image_gd_settings() { + if (image_gd_check_settings()) { + return t('The built-in GD2 toolkit is installed and working properly.'); + } + else { + form_set_error('image_toolkit', t("The built-in GD image toolkit requires that the GD module for PHP be installed and configured properly. For more information see %url.", array('%url' => 'http://php.net/image'))); + return false; + } +} + +/** + * Verify GD2 settings (that the right version is actually installed). + * + * @return boolean + */ +function image_gd_check_settings() { + if ($check = get_extension_funcs('gd')) { + if (in_array('imagegd2', $check)) { + // GD2 support is available. + return true; + } + } + return false; +} + +/** + * Scale an image to the specified size using GD. + */ +function image_gd_resize($source, $destination, $width, $height) { + if (!file_exists($source)) { + return false; + } + + $info = image_get_info($source); + if (!$info) { + return false; + } + + $im = image_gd_open($source, $info['extension']); + if (!$im) { + return false; + } + + $res = imageCreateTrueColor($width, $height); + imageCopyResampled($res, $im, 0, 0, 0, 0, $width, $height, $info['width'], $info['height']); + $result = image_gd_close($res, $destination, $info['extension']); + + imageDestroy($res); + imageDestroy($im); + + return $result; +} + +/** + * Rotate an image the given number of degrees. + */ +function image_gd_rotate($source, $destination, $degrees, $bg_color = 0) { + if (!function_exists('imageRotate')) { + return false; + } + + $info = image_get_info($source); + if (!$info) { + return false; + } + + $im = image_gd_open($source, $info['extension']); + if (!$im) { + return false; + } + + $res = imageRotate($im, $degrees, $bg_color); + $result = image_gd_close($res, $destination, $info['extension']); + + return $result; +} + +/** + * Crop an image using the GD toolkit. + */ +function image_gd_crop($source, $destination, $x, $y, $width, $height) { + $info = image_get_info($source); + if (!$info) { + return false; + } + + $im = image_gd_open($source, $info['extension']); + $res = imageCreateTrueColor($width, $height); + imageCopy($res, $im, 0, 0, $x, $y, $width, $height); + $result = image_gd_close($res, $destination, $info['extension']); + + imageDestroy($res); + imageDestroy($im); + + return $result; +} + +/** + * GD helper function to create an image resource from a file. + */ +function image_gd_open($file, $extension) { + $extension = str_replace('jpg', 'jpeg', $extension); + $open_func = 'imageCreateFrom'. $extension; + if (!function_exists($open_func)) { + return false; + } + return $open_func($file); +} + +/** + * GD helper to write an image resource to a destination file. + */ +function image_gd_close($res, $destination, $extension) { + $extension = str_replace('jpg', 'jpeg', $extension); + $close_func = 'image'. $extension; + if (!function_exists($close_func)) { + return false; + } + return $close_func($res, $destination); +} + + diff --git a/includes/install.inc b/includes/install.inc new file mode 100644 index 0000000..7a12c31 --- /dev/null +++ b/includes/install.inc @@ -0,0 +1,81 @@ +name] = $row->schema_version; + } + } + + return $versions[$module]; +} + +/** + * Update the installed version information for a module. + * + * @param $module + * A module name. + * @param $version + * The new schema version. + */ +function drupal_set_installed_schema_version($module, $version) { + db_query("UPDATE {system} SET schema_version = %d WHERE name = '%s'", $version, $module); +} diff --git a/includes/locale.inc b/includes/locale.inc new file mode 100644 index 0000000..5c6d83e --- /dev/null +++ b/includes/locale.inc @@ -0,0 +1,1548 @@ +lid, $code); + } + + // If only the language was added, and not a PO file import triggered + // the language addition, we need to inform the user on how to start + // a translation + if ($onlylanguage) { + drupal_set_message(t('The language %locale has been created, and can now be used to import a translation. More information is available in the help screen.', array('%locale' => theme('placeholder', t($name)), '%locale-help' => url('admin/help/locale')))); + } + else { + drupal_set_message(t('The language %locale has been created.', array('%locale' => theme('placeholder', t($name))))); + } + + watchdog('locale', t('The %language language (%locale) has been created.', array('%language' => theme('placeholder', $name), '%locale' => theme('placeholder', $code)))); +} + +/** + * User interface for the language management screen. + */ +function _locale_admin_manage_screen() { + $languages = locale_supported_languages(TRUE, TRUE); + + $options = array(); + $form['name'] = array('#tree' => TRUE); + foreach ($languages['name'] as $key => $lang) { + $options[$key] = ''; + $status = db_fetch_object(db_query("SELECT isdefault, enabled FROM {locales_meta} WHERE locale = '%s'", $key)); + if ($status->enabled) { + $enabled[] = $key; + } + if ($status->isdefault) { + $isdefault = $key; + } + if ($key == 'en') { + $form['name']['en'] = array('#value' => check_plain($lang)); + } + else { + $original = db_fetch_object(db_query("SELECT COUNT(*) AS strings FROM {locales_source}")); + $translation = db_fetch_object(db_query("SELECT COUNT(*) AS translation FROM {locales_target} WHERE locale = '%s' AND translation != ''", $key)); + + $ratio = ($original->strings > 0 && $translation->translation > 0) ? round(($translation->translation/$original->strings)*100., 2) : 0; + + $form['name'][$key] = array('#type' => 'textfield', + '#default_value' => $lang, + '#size' => 15, + '#maxlength' => 64, + ); + $form['translation'][$key] = array('#value' => "$translation->translation/$original->strings ($ratio%)"); + } + } + $form['enabled'] = array('#type' => 'checkboxes', + '#options' => $options, + '#default_value' => $enabled, + ); + $form['site_default'] = array('#type' => 'radios', + '#options' => $options, + '#default_value' => $isdefault, + ); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + + return drupal_get_form('_locale_admin_manage_screen', $form, 'locale_admin_manage_screen'); +} + +/** + * Theme the locale admin manager form. + */ +function theme_locale_admin_manage_screen($form) { + foreach ($form['name'] as $key => $element) { + // Do not take form control structures. + if (is_array($element) && element_child($key)) { + $rows[] = array(check_plain($key), form_render($form['name'][$key]), form_render($form['enabled'][$key]), form_render($form['site_default'][$key]), ($key != 'en' ? form_render($form['translation'][$key]) : message_na()), ($key != 'en' ? l(t('delete'), 'admin/locale/language/delete/'. $key) : '')); + } + } + $header = array(array('data' => t('Code')), array('data' => t('English name')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Translated')), array('data' => t('Operations'))); + $output = theme('table', $header, $rows); + $output .= form_render($form); + + return $output; +} + +/** + * Process locale admin manager form submissions. + */ +function _locale_admin_manage_screen_submit($form_id, $form_values) { + // Save changes to existing languages. + $languages = locale_supported_languages(FALSE, TRUE); + foreach($languages['name'] as $key => $value) { + if ($form_values['site_default'] == $key) { + $form_values['enabled'][$key] = 1; // autoenable the default language + } + $enabled = $form_values['enabled'][$key] ? 1 : 0; + if ($key == 'en') { + // Disallow name change for English locale. + db_query("UPDATE {locales_meta} SET isdefault = %d, enabled = %d WHERE locale = 'en'", ($form_values['site_default'] == $key), $enabled); + } + else { + db_query("UPDATE {locales_meta} SET name = '%s', isdefault = %d, enabled = %d WHERE locale = '%s'", $form_values['name'][$key], ($form_values['site_default'] == $key), $enabled, $key); + } + } + drupal_set_message(t('Configuration saved.')); + + // Changing the locale settings impacts the interface: + cache_clear_all(); + + return 'admin/locale/language/overview'; +} + +/** + * User interface for the language addition screen. + */ +function _locale_admin_manage_add_screen() { + $isocodes = _locale_prepare_iso_list(); + + $form = array(); + $form['language list'] = array('#type' => 'fieldset', + '#title' => t('Language list'), + '#collapsible' => TRUE, + ); + $form['language list']['langcode'] = array('#type' => 'select', + '#title' => t('Language name'), + '#default_value' => key($isocodes), + '#options' => $isocodes, + '#description' => t('Select your language here, or add it below, if you are unable to find it.'), + ); + $form['language list']['submit'] = array('#type' => 'submit', '#value' => t('Add language')); + + $output = drupal_get_form('locale_add_language_form', $form); + + $form = array(); + $form['custom language'] = array('#type' => 'fieldset', + '#title' => t('Custom language'), + '#collapsible' => TRUE, + ); + $form['custom language']['langcode'] = array('#type' => 'textfield', + '#title' => t('Language code'), + '#size' => 12, + '#maxlength' => 60, + '#required' => TRUE, + '#description' => t("Commonly this is an ISO 639 language code with an optional country code for regional variants. Examples include 'en', 'en-US' and 'zh-cn'.", array('%iso-codes' => 'http://www.w3.org/WAI/ER/IG/ert/iso639.htm')), + ); + $form['custom language']['langname'] = array('#type' => 'textfield', + '#title' => t('Language name in English'), + '#maxlength' => 64, + '#required' => TRUE, + '#description' => t('Name of the language. Will be available for translation in all languages.'), + ); + $form['custom language']['submit'] = array('#type' => 'submit', '#value' => t('Add custom language')); + + // Use the validation and submit functions of the add language form. + $output .= drupal_get_form('locale_custom_language_form', $form, 'locale_add_language_form'); + + return $output; +} + +/** + * Validate the language addition form. + */ +function locale_add_language_form_validate($form_id, $form_values) { + if ($duplicate = db_num_rows(db_query("SELECT locale FROM {locales_meta} WHERE locale = '%s'", $form_values['langcode'])) != 0) { + form_set_error(t('The language %language (%code) already exists.', array('%language' => theme('placeholder', check_plain($form_values['langname'])), '%code' => theme('placeholder', $form_values['langcode'])))); + } + + if (!isset($form_values['langname'])) { + $isocodes = _locale_get_iso639_list(); + if (!isset($isocodes[$form_values['langcode']])) { + form_set_error('langcode', t('Invalid language code.')); + } + } +} + +/** + * Process the language addition form submission. + */ +function locale_add_language_form_submit($form_id, $form_values) { + if (isset($form_values['langname'])) { + // Custom language form. + _locale_add_language($form_values['langcode'], $form_values['langname']); + } + else { + $isocodes = _locale_get_iso639_list(); + _locale_add_language($form_values['langcode'], $isocodes[$form_values['langcode']][0]); + } + + return 'admin/locale'; +} + +/** + * User interface for the translation import screen. + */ +function _locale_admin_import_screen() { + $languages = locale_supported_languages(FALSE, TRUE); + $languages = array_map('t', $languages['name']); + unset($languages['en']); + + if (!count($languages)) { + $languages = _locale_prepare_iso_list(); + } + else { + $languages = array( + t('Already added languages') => $languages, + t('Languages not yet added') => _locale_prepare_iso_list() + ); + } + + $form = array(); + $form['import'] = array('#type' => 'fieldset', + '#title' => t('Import translation'), + ); + $form['import']['file'] = array('#type' => 'file', + '#title' => t('Language file'), + '#size' => 50, + '#description' => t('A gettext Portable Object (.po) file.'), + ); + $form['import']['langcode'] = array('#type' => 'select', + '#title' => t('Import into'), + '#options' => $languages, + '#description' => t('Choose the language you want to add strings into. If you choose a language which is not yet set up, then it will be added.'), + ); + $form['import']['mode'] = array('#type' => 'radios', + '#title' => t('Mode'), + '#default_value' => 'overwrite', + '#options' => array('overwrite' => t('Strings in the uploaded file replace existing ones, new ones are added'), 'keep' => t('Existing strings are kept, only new strings are added')), + ); + $form['import']['submit'] = array('#type' => 'submit', '#value' => t('Import')); + $form['#attributes']['enctype'] = 'multipart/form-data'; + + return drupal_get_form('_locale_admin_import', $form); +} + +/** + * Process the locale import form submission. + */ +function _locale_admin_import_submit($form_id, $form_values) { + // Add language, if not yet supported + $languages = locale_supported_languages(TRUE, TRUE); + if (!isset($languages['name'][$form_values['langcode']])) { + $isocodes = _locale_get_iso639_list(); + _locale_add_language($form_values['langcode'], $isocodes[$form_values['langcode']][0], FALSE); + } + + // Now import strings into the language + $file = file_check_upload('file'); + if ($ret = _locale_import_po($file, $form_values['langcode'], $form_values['mode']) == FALSE) { + $message = t('The translation import of %filename failed.', array('%filename' => theme('placeholder', $file->filename))); + drupal_set_message($message, 'error'); + watchdog('locale', $message, WATCHDOG_ERROR); + } + + return 'admin/locale'; +} + +/** + * User interface for the translation export screen + */ +function _locale_admin_export_screen() { + $languages = locale_supported_languages(FALSE, TRUE); + $languages = array_map('t', $languages['name']); + unset($languages['en']); + + // Offer language specific export if any language is set up + if (count($languages)) { + $form = array(); + $form['export'] = array('#type' => 'fieldset', + '#title' => t('Export translation'), + '#collapsible' => TRUE, + ); + $form['export']['langcode'] = array('#type' => 'select', + '#title' => t('Language name'), + '#options' => $languages, + '#description' => t('Select the language you would like to export in gettext Portable Object (.po) format.'), + ); + $form['export']['submit'] = array('#type' => 'submit', '#value' => t('Export')); + $output = drupal_get_form('_locale_export_po', $form); + } + + // Complete template export of the strings + $form = array(); + $form['export'] = array('#type' => 'fieldset', + '#title' => t('Export template'), + '#collapsible' => TRUE, + '#description' => t('Generate a gettext Portable Object Template (.pot) file with all the interface strings from the Drupal locale database.'), + ); + $form['export']['submit'] = array('#type' => 'submit', '#value' => t('Export')); + $output .= drupal_get_form('_locale_export_pot', $form, '_locale_export_po'); + + return $output; +} + +/** + * Process a locale export form submissions. + */ +function _locale_export_po_submit($form_id, $form_values) { + _locale_export_po($form_values['langcode']); +} + +/** + * User interface for the string search screen + */ +function _locale_string_seek_form() { + // Get *all* languages set up + $languages = locale_supported_languages(FALSE, TRUE); + asort($languages['name']); unset($languages['name']['en']); + $languages['name'] = array_map('check_plain', $languages['name']); + + // Present edit form preserving previous user settings + $query = _locale_string_seek_query(); + $form = array(); + $form['search'] = array('#type' => 'fieldset', + '#title' => t('Search'), + ); + $form['search']['string'] = array('#type' => 'textfield', + '#title' => t('Strings to search for'), + '#default_value' => $query->string, + '#size' => 30, + '#maxlength' => 30, + '#description' => t('Leave blank to show all strings. The search is case sensitive.'), + ); + $form['search']['language'] = array('#type' => 'radios', + '#title' => t('Language'), + '#default_value' => ($query->language ? $query->language : 'all'), + '#options' => array_merge(array('all' => t('All languages'), 'en' => t('English (provided by Drupal)')), $languages['name']), + ); + $form['search']['searchin'] = array('#type' => 'radios', + '#title' => t('Search in'), + '#default_value' => ($query->searchin ? $query->searchin : 'all'), + '#options' => array('all' => t('All strings in that language'), 'translated' => t('Only translated strings'), 'untranslated' => t('Only untranslated strings')), + ); + $form['search']['submit'] = array('#type' => 'submit', '#value' => t('Search')); + $form['#redirect'] = FALSE; + + return drupal_get_form('_locale_string_seek', $form); +} + +/** + * User interface for string editing. + */ +function _locale_string_edit($lid) { + $languages = locale_supported_languages(FALSE, TRUE); + unset($languages['name']['en']); + + $result = db_query('SELECT DISTINCT s.source, t.translation, t.locale FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid WHERE s.lid = %d', $lid); + $form = array(); + $form['translations'] = array('#tree' => TRUE); + while ($translation = db_fetch_object($result)) { + $orig = $translation->source; + + // Approximate the number of rows in a textfield with a maximum of 10. + $rows = min(ceil(str_word_count($orig) / 12), 10); + + $form['translations'][$translation->locale] = array( + '#type' => 'textarea', + '#title' => $languages['name'][$translation->locale], + '#default_value' => $translation->translation, + '#rows' => $rows, + ); + unset($languages['name'][$translation->locale]); + } + + // Handle erroneous lid. + if (!isset($orig)){ + drupal_set_message(t('String not found.')); + drupal_goto('admin/locale/string/search'); + } + + // Add original text. Assign negative weight so that it floats to the top. + $form['item'] = array('#type' => 'item', + '#title' => t('Original text'), + '#value' => check_plain(wordwrap($orig, 0)), + '#weight' => -1, + ); + + foreach ($languages['name'] as $key => $lang) { + $form['translations'][$key] = array( + '#type' => 'textarea', + '#title' => $lang, + '#rows' => $rows, + ); + } + + $form['lid'] = array('#type' => 'value', '#value' => $lid); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save translations')); + + return drupal_get_form('_locale_string_edit', $form); +} + +/** + * Process string editing form submissions. + * Saves all translations of one string submitted from a form. + */ +function _locale_string_edit_submit($form_id, $form_values) { + $lid = $form_values['lid']; + foreach ($form_values['translations'] as $key => $value) { + $value = filter_xss_admin($value); + $trans = db_fetch_object(db_query("SELECT translation FROM {locales_target} WHERE lid = %d AND locale = '%s'", $lid, $key)); + if (isset($trans->translation)) { + db_query("UPDATE {locales_target} SET translation = '%s' WHERE lid = %d AND locale = '%s'", $value, $lid, $key); + } + else { + db_query("INSERT INTO {locales_target} (lid, translation, locale) VALUES (%d, '%s', '%s')", $lid, $value, $key); + } + } + drupal_set_message(t('The string has been saved.')); + + // Refresh the locale cache. + locale_refresh_cache(); + // Rebuild the menu, strings may have changed. + menu_rebuild(); + + return 'admin/locale/string/search'; +} + +/** + * Delete a language string. + */ +function _locale_string_delete($lid) { + db_query('DELETE FROM {locales_source} WHERE lid = %d', $lid); + db_query('DELETE FROM {locales_target} WHERE lid = %d', $lid); + locale_refresh_cache(); + drupal_set_message(t('The string has been removed.')); + + drupal_goto('admin/locale/string/search'); +} + +/** + * Parses Gettext Portable Object file information and inserts into database + * + * @param $file Object contains properties of local file to be imported + * @param $lang Language code + * @param $mode should existing translations be replaced? + */ +function _locale_import_po($file, $lang, $mode) { + // If not in 'safe mode', increase the maximum execution time: + if (!ini_get('safe_mode')) { + set_time_limit(240); + } + + // Check if we have the language already in the database + if (!db_fetch_object(db_query("SELECT locale FROM {locales_meta} WHERE locale = '%s'", $lang))) { + drupal_set_message(t('The language selected for import is not supported.'), 'error'); + return FALSE; + } + + // Get strings from file (returns on failure after a partial import, or on success) + $status = _locale_import_read_po($file, $mode, $lang); + if ($status === FALSE) { + // error messages are set in _locale_import_read_po + return FALSE; + } + + // Get status information on import process + list($headerdone, $additions, $updates) = _locale_import_one_string('report', $mode); + + if (!$headerdone) { + drupal_set_message(t('The translation file %filename appears to have a missing or malformed header.', array('%filename' => theme('placeholder', $file->filename))), 'error'); + } + + // rebuild locale cache + cache_clear_all("locale:$lang"); + + // rebuild the menu, strings may have changed + menu_rebuild(); + + drupal_set_message(t('The translation was successfully imported. There are %number newly created translated strings and %update strings were updated.', array('%number' => $additions, '%update' => $updates))); + watchdog('locale', t('Imported %file into %locale: %number new strings added and %update updated.', array('%file' => theme('placeholder', $file->filename), '%locale' => theme('placeholder', $lang), '%number' => $additions, '%update' => $updates))); + return TRUE; +} + +/** + * Parses Gettext Portable Object file into an array + * + * @param $file Object with properties of local file to parse + * @author Jacobo Tarrio + */ +function _locale_import_read_po($file, $mode, $lang) { + + $message = theme('placeholder', $file->filename); + $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return + if (!$fd) { + drupal_set_message(t('The translation import failed, because the file %filename could not be read.', array('%filename' => $message)), 'error'); + return FALSE; + } + + $context = "COMMENT"; // Parser context: COMMENT, MSGID, MSGID_PLURAL, MSGSTR and MSGSTR_ARR + $current = array(); // Current entry being read + $plural = 0; // Current plural form + $lineno = 0; // Current line + + while (!feof($fd)) { + $line = fgets($fd, 10*1024); // A line should not be this long + $lineno++; + $line = trim(strtr($line, array("\\\n" => ""))); + + if (!strncmp("#", $line, 1)) { // A comment + if ($context == "COMMENT") { // Already in comment context: add + $current["#"][] = substr($line, 1); + } + elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one + _locale_import_one_string($current, $mode, $lang); + $current = array(); + $current["#"][] = substr($line, 1); + $context = "COMMENT"; + } + else { // Parse error + drupal_set_message(t('The translation file %filename contains an error: "msgstr" was expected but not found on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + } + elseif (!strncmp("msgid_plural", $line, 12)) { + if ($context != "MSGID") { // Must be plural form for current entry + drupal_set_message(t('The translation file %filename contains an error: "msgid_plural" was expected but not found on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + $line = trim(substr($line, 12)); + $quoted = _locale_import_parse_quoted($line); + if ($quoted === false) { + drupal_set_message(t('The translation file %filename contains a syntax error on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + $current["msgid"] = $current["msgid"] ."\0". $quoted; + $context = "MSGID_PLURAL"; + } + elseif (!strncmp("msgid", $line, 5)) { + if ($context == "MSGSTR") { // End current entry, start a new one + _locale_import_one_string($current, $mode, $lang); + $current = array(); + } + elseif ($context == "MSGID") { // Already in this context? Parse error + drupal_set_message(t('The translation file %filename contains an error: "msgid" is unexpected on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + $line = trim(substr($line, 5)); + $quoted = _locale_import_parse_quoted($line); + if ($quoted === false) { + drupal_set_message(t('The translation file %filename contains a syntax error on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + $current["msgid"] = $quoted; + $context = "MSGID"; + } + elseif (!strncmp("msgstr[", $line, 7)) { + if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[] + drupal_set_message(t('The translation file %filename contains an error: "msgstr[]" is unexpected on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + if (strpos($line, "]") === false) { + drupal_set_message(t('The translation file %filename contains a syntax error on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + $frombracket = strstr($line, "["); + $plural = substr($frombracket, 1, strpos($frombracket, "]") - 1); + $line = trim(strstr($line, " ")); + $quoted = _locale_import_parse_quoted($line); + if ($quoted === false) { + drupal_set_message(t('The translation file %filename contains a syntax error on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + $current["msgstr"][$plural] = $quoted; + $context = "MSGSTR_ARR"; + } + elseif (!strncmp("msgstr", $line, 6)) { + if ($context != "MSGID") { // Should come just after a msgid block + drupal_set_message(t('The translation file %filename contains an error: "msgstr" is unexpected on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + $line = trim(substr($line, 6)); + $quoted = _locale_import_parse_quoted($line); + if ($quoted === false) { + drupal_set_message(t('The translation file %filename contains a syntax error on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + $current["msgstr"] = $quoted; + $context = "MSGSTR"; + } + elseif ($line != "") { + $quoted = _locale_import_parse_quoted($line); + if ($quoted === false) { + drupal_set_message(t('The translation file %filename contains a syntax error on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + if (($context == "MSGID") || ($context == "MSGID_PLURAL")) { + $current["msgid"] .= $quoted; + } + elseif ($context == "MSGSTR") { + $current["msgstr"] .= $quoted; + } + elseif ($context == "MSGSTR_ARR") { + $current["msgstr"][$plural] .= $quoted; + } + else { + drupal_set_message(t('The translation file %filename contains an error: there is an unexpected string on line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + } + } + + // End of PO file, flush last entry + if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { + _locale_import_one_string($current, $mode, $lang); + } + elseif ($context != "COMMENT") { + drupal_set_message(t('The translation file %filename ended unexpectedly at line %line.', array('%filename' => $message, '%line' => $lineno)), 'error'); + return FALSE; + } + +} + +/** + * Imports a string into the database + * + * @param $value Information about the string + * @author Jacobo Tarrio + */ +function _locale_import_one_string($value, $mode, $lang = NULL) { + static $additions = 0; + static $updates = 0; + static $headerdone = FALSE; + + // Report the changes made (called at end of import) + if ($value == 'report') { + return array($headerdone, $additions, $updates); + } + // Current string is the header information + elseif ($value['msgid'] == '') { + $hdr = _locale_import_parse_header($value['msgstr']); + + // Get the plural formula + if ($hdr["Plural-Forms"] && $p = _locale_import_parse_plural_forms($hdr["Plural-Forms"], $file->filename)) { + list($nplurals, $plural) = $p; + db_query("UPDATE {locales_meta} SET plurals = %d, formula = '%s' WHERE locale = '%s'", $nplurals, $plural, $lang); + } + else { + db_query("UPDATE {locales_meta} SET plurals = %d, formula = '%s' WHERE locale = '%s'", 0, '', $lang); + } + $headerdone = TRUE; + } + // Some real string to import + else { + $comments = filter_xss_admin(_locale_import_shorten_comments($value['#'])); + + // Handle a translation for some plural string + if (strpos($value['msgid'], "\0")) { + $english = explode("\0", $value['msgid'], 2); + $entries = array_keys($value['msgstr']); + for ($i = 3; $i <= count($entries); $i++) { + $english[] = $english[1]; + } + $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries); + $english = array_map('_locale_import_append_plural', $english, $entries); + foreach ($translation as $key => $trans) { + if ($key == 0) { + $plid = 0; + } + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english[$key])); + if ($loc->lid) { // a string exists + $lid = $loc->lid; + // update location field + db_query("UPDATE {locales_source} SET location = '%s' WHERE lid = %d", $comments, $lid); + $trans2 = db_fetch_object(db_query("SELECT lid, translation, plid, plural FROM {locales_target} WHERE lid = %d AND locale = '%s'", $lid, $lang)); + if (!$trans2->lid) { // no translation in current language + db_query("INSERT INTO {locales_target} (lid, locale, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $lang, filter_xss_admin($trans), $plid, $key); + $additions++; + } // translation exists + else if ($mode == 'overwrite' || $trans2->translation == '') { + db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE locale = '%s' AND lid = %d", filter_xss_admin($trans), $plid, $key, $lang, $lid); + if ($trans2->translation == '') { + $additions++; + } + else { + $updates++; + } + } + } + else { // no string + db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, filter_xss_admin($english[$key])); + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english[$key])); + $lid = $loc->lid; + db_query("INSERT INTO {locales_target} (lid, locale, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $lang, filter_xss_admin($trans), $plid, $key); + if ($trans != '') { + $additions++; + } + } + $plid = $lid; + } + } + + // A simple translation + else { + $english = $value['msgid']; + $translation = $value['msgstr']; + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english)); + if ($loc->lid) { // a string exists + $lid = $loc->lid; + // update location field + db_query("UPDATE {locales_source} SET location = '%s' WHERE source = '%s'", $comments, $english); + $trans = db_fetch_object(db_query("SELECT lid, translation FROM {locales_target} WHERE lid = %d AND locale = '%s'", $lid, $lang)); + if (!$trans->lid) { // no translation in current language + db_query("INSERT INTO {locales_target} (lid, locale, translation) VALUES (%d, '%s', '%s')", $lid, $lang, filter_xss_admin($translation)); + $additions++; + } // translation exists + else if ($mode == 'overwrite') { //overwrite in any case + db_query("UPDATE {locales_target} SET translation = '%s' WHERE locale = '%s' AND lid = %d", filter_xss_admin($translation), $lang, $lid); + if ($trans->translation == '') { + $additions++; + } + else { + $updates++; + } + } // overwrite if empty string + else if ($trans->translation == '') { + db_query("UPDATE {locales_target} SET translation = '%s' WHERE locale = '%s' AND lid = %d", $translation, $lang, $lid); + $additions++; + } + } + else { // no string + db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, $english); + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english)); + $lid = $loc->lid; + db_query("INSERT INTO {locales_target} (lid, locale, translation) VALUES (%d, '%s', '%s')", $lid, $lang, filter_xss_admin($translation)); + if ($translation != '') { + $additions++; + } + } + } + } +} + +/** + * Parses a Gettext Portable Object file header + * + * @param $header A string containing the complete header + * @return An associative array of key-value pairs + * @author Jacobo Tarrio + */ +function _locale_import_parse_header($header) { + $hdr = array(); + + $lines = explode("\n", $header); + foreach ($lines as $line) { + $line = trim($line); + if ($line) { + list($tag, $contents) = explode(":", $line, 2); + $hdr[trim($tag)] = trim($contents); + } + } + + return $hdr; +} + +/** + * Parses a Plural-Forms entry from a Gettext Portable Object file header + * + * @param $pluralforms A string containing the Plural-Forms entry + * @param $filename A string containing the filename + * @return An array containing the number of plurals and a + * formula in PHP for computing the plural form + * @author Jacobo Tarrio + */ +function _locale_import_parse_plural_forms($pluralforms, $filename) { + // First, delete all whitespace + $pluralforms = strtr($pluralforms, array(" " => "", "\t" => "")); + + // Select the parts that define nplurals and plural + $nplurals = strstr($pluralforms, "nplurals="); + if (strpos($nplurals, ";")) { + $nplurals = substr($nplurals, 9, strpos($nplurals, ";") - 9); + } + else { + return FALSE; + } + $plural = strstr($pluralforms, "plural="); + if (strpos($plural, ";")) { + $plural = substr($plural, 7, strpos($plural, ";") - 7); + } + else { + return FALSE; + } + + // Get PHP version of the plural formula + $plural = _locale_import_parse_arithmetic($plural); + + if ($plural !== FALSE) { + return array($nplurals, $plural); + } + else { + drupal_set_message(t('The translation file %filename contains an error: the plural formula could not be parsed.', array('%filename' => theme('placeholder', $filename))), 'error'); + return FALSE; + } +} + +/** + * Parses and sanitizes an arithmetic formula into a PHP expression + * + * While parsing, we ensure, that the operators have the right + * precedence and associativity. + * + * @param $string A string containing the arithmetic formula + * @return The PHP version of the formula + * @author Jacobo Tarrio + */ +function _locale_import_parse_arithmetic($string) { + // Operator precedence table + $prec = array("(" => -1, ")" => -1, "?" => 1, ":" => 1, "||" => 3, "&&" => 4, "==" => 5, "!=" => 5, "<" => 6, ">" => 6, "<=" => 6, ">=" => 6, "+" => 7, "-" => 7, "*" => 8, "/" => 8, "%" => 8); + // Right associativity + $rasc = array("?" => 1, ":" => 1); + + $tokens = _locale_import_tokenize_formula($string); + + // Parse by converting into infix notation then back into postfix + $opstk = array(); + $elstk = array(); + + foreach ($tokens as $token) { + $ctok = $token; + + // Numbers and the $n variable are simply pushed into $elarr + if (is_numeric($token)) { + $elstk[] = $ctok; + } + elseif ($ctok == "n") { + $elstk[] = '$n'; + } + elseif ($ctok == "(") { + $opstk[] = $ctok; + } + elseif ($ctok == ")") { + $topop = array_pop($opstk); + while (($topop != NULL) && ($topop != "(")) { + $elstk[] = $topop; + $topop = array_pop($opstk); + } + } + elseif ($prec[$ctok]) { + // If it's an operator, then pop from $oparr into $elarr until the + // precedence in $oparr is less than current, then push into $oparr + $topop = array_pop($opstk); + while (($topop != NULL) && ($prec[$topop] >= $prec[$ctok]) && !(($prec[$topop] == $prec[$ctok]) && $rasc[$topop] && $rasc[$ctok])) { + $elstk[] = $topop; + $topop = array_pop($opstk); + } + if ($topop) { + $opstk[] = $topop; // Return element to top + } + $opstk[] = $ctok; // Parentheses are not needed + } + else { + return false; + } + } + + // Flush operator stack + $topop = array_pop($opstk); + while ($topop != NULL) { + $elstk[] = $topop; + $topop = array_pop($opstk); + } + + // Now extract formula from stack + $prevsize = count($elstk) + 1; + while (count($elstk) < $prevsize) { + $prevsize = count($elstk); + for ($i = 2; $i < count($elstk); $i++) { + $op = $elstk[$i]; + if ($prec[$op]) { + $f = ""; + if ($op == ":") { + $f = $elstk[$i - 2] ."):". $elstk[$i - 1] .")"; + } + elseif ($op == "?") { + $f = "(". $elstk[$i - 2] ."?(". $elstk[$i - 1]; + } + else { + $f = "(". $elstk[$i - 2] . $op . $elstk[$i - 1] .")"; + } + array_splice($elstk, $i - 2, 3, $f); + break; + } + } + } + + // If only one element is left, the number of operators is appropriate + if (count($elstk) == 1) { + return $elstk[0]; + } + else { + return FALSE; + } +} + +/** + * Backward compatible implementation of token_get_all() for formula parsing + * + * @param $string A string containing the arithmetic formula + * @return The PHP version of the formula + * @author Gerhard Killesreiter + */ +function _locale_import_tokenize_formula($formula) { + $formula = str_replace(" ", "", $formula); + $tokens = array(); + for ($i = 0; $i < strlen($formula); $i++) { + if (is_numeric($formula[$i])) { + $num = $formula[$i]; + $j = $i + 1; + while($j < strlen($formula) && is_numeric($formula[$j])) { + $num .= $formula[$j]; + $j++; + } + $i = $j - 1; + $tokens[] = $num; + } + elseif ($pos = strpos(" =<>!&|", $formula[$i])) { // We won't have a space + $next = $formula[$i + 1]; + switch ($pos) { + case 1: + case 2: + case 3: + case 4: + if ($next == '=') { + $tokens[] = $formula[$i] .'='; + $i++; + } + else { + $tokens[] = $formula[$i]; + } + break; + case 5: + if ($next == '&') { + $tokens[] = '&&'; + $i++; + } + else { + $tokens[] = $formula[$i]; + } + break; + case 6: + if ($next == '|') { + $tokens[] = '||'; + $i++; + } + else { + $tokens[] = $formula[$i]; + } + break; + } + } + else { + $tokens[] = $formula[$i]; + } + } + return $tokens; +} + +/** + * Modify a string to contain proper count indices + * + * This is a callback function used via array_map() + * + * @param $entry An array element + * @param $key Index of the array element + */ +function _locale_import_append_plural($entry, $key) { + // No modifications for 0, 1 + if ($key == 0 || $key == 1) { + return $entry; + } + + // First remove any possibly false indices, then add new ones + $entry = preg_replace('/(%count)\[[0-9]\]/', '\\1', $entry); + return preg_replace('/(%count)/', "\\1[$key]", $entry); +} + +/** + * Generate a short, one string version of the passed comment array + * + * @param $comment An array of strings containing a comment + * @return Short one string version of the comment + */ +function _locale_import_shorten_comments($comment) { + $comm = ''; + while (count($comment)) { + $test = $comm . substr(array_shift($comment), 1) .', '; + if (strlen($comm) < 130) { + $comm = $test; + } + else { + break; + } + } + return substr($comm, 0, -2); +} + +/** + * Parses a string in quotes + * + * @param $string A string specified with enclosing quotes + * @return The string parsed from inside the quotes + */ +function _locale_import_parse_quoted($string) { + if (substr($string, 0, 1) != substr($string, -1, 1)) { + return FALSE; // Start and end quotes must be the same + } + $quote = substr($string, 0, 1); + $string = substr($string, 1, -1); + if ($quote == '"') { // Double quotes: strip slashes + return stripcslashes($string); + } + elseif ($quote == "'") { // Simple quote: return as-is + return $string; + } + else { + return FALSE; // Unrecognized quote + } +} + +/** + * Exports a Portable Object (Template) file for a language + * + * @param $language Selects a language to generate the output for + */ +function _locale_export_po($language) { + global $user; + + // Get language specific strings, or all strings + if ($language) { + $meta = db_fetch_object(db_query("SELECT * FROM {locales_meta} WHERE locale = '%s'", $language)); + $result = db_query("SELECT s.lid, s.source, s.location, t.translation, t.plid, t.plural FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid WHERE t.locale = '%s' ORDER BY t.plid, t.plural", $language); + } + else { + $result = db_query("SELECT s.lid, s.source, s.location, t.plid, t.plural FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid ORDER BY t.plid, t.plural"); + } + + // Build array out of the database results + $parent = array(); + while ($child = db_fetch_object($result)) { + if ($child->source != '') { + $parent[$child->lid]['comment'] = $child->location; + $parent[$child->lid]['msgid'] = $child->source; + if ($child->plid) { + $parent[$child->lid][$child->plid]['plural'] = $child->lid; + $parent[$child->lid][$child->plid]['translation'] = $child->translation; + $parent[$child->lid][$child->plid]['msgid'] = $child->source; + } + else { + $parent[$child->lid]['translation'] = $child->translation; + } + } + } + + // Generating Portable Object file for a language + if ($language) { + $filename = $language .'.po'; + $header .= "# $meta->name translation of ". variable_get('site_name', 'Drupal') ."\n"; + $header .= '# Copyright (c) '. date('Y') .' '. $user->name .' <'. $user->mail .">\n"; + $header .= "#\n"; + $header .= "msgid \"\"\n"; + $header .= "msgstr \"\"\n"; + $header .= "\"Project-Id-Version: PROJECT VERSION\\n\"\n"; + $header .= "\"POT-Creation-Date: ". date("Y-m-d H:iO") ."\\n\"\n"; + $header .= "\"PO-Revision-Date: ". date("Y-m-d H:iO") ."\\n\"\n"; + $header .= "\"Last-Translator: ". $user->name .' <'. $user->mail .">\\n\"\n"; + $header .= "\"Language-Team: ". $meta->name .' <'. $user->mail .">\\n\"\n"; + $header .= "\"MIME-Version: 1.0\\n\"\n"; + $header .= "\"Content-Type: text/plain; charset=utf-8\\n\"\n"; + $header .= "\"Content-Transfer-Encoding: 8bit\\n\"\n"; + if ($meta->formula && $meta->plurals) { + $header .= "\"Plural-Forms: nplurals=". $meta->plurals ."; plural=". strtr($meta->formula, '$', '') .";\\n\"\n"; + } + $header .= "\n"; + watchdog('locale', t('Exported %locale translation file: %filename.', array('%locale' => theme('placeholder', $meta->name), '%filename' => theme('placeholder', $filename)))); + } + + // Generating Portable Object Template + else { + $filename = 'drupal.pot'; + $header .= "# LANGUAGE translation of PROJECT\n"; + $header .= "# Copyright (c) YEAR NAME \n"; + $header .= "#\n"; + $header .= "msgid \"\"\n"; + $header .= "msgstr \"\"\n"; + $header .= "\"Project-Id-Version: PROJECT VERSION\\n\"\n"; + $header .= "\"POT-Creation-Date: ". date("Y-m-d H:iO") ."\\n\"\n"; + $header .= "\"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\\n\"\n"; + $header .= "\"Last-Translator: NAME \\n\"\n"; + $header .= "\"Language-Team: LANGUAGE \\n\"\n"; + $header .= "\"MIME-Version: 1.0\\n\"\n"; + $header .= "\"Content-Type: text/plain; charset=utf-8\\n\"\n"; + $header .= "\"Content-Transfer-Encoding: 8bit\\n\"\n"; + $header .= "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n\"\n"; + $header .= "\n"; + watchdog('locale', t('Exported translation file: %filename.', array('%filename' => theme('placeholder', $filename)))); + } + + // Start download process + header("Content-Disposition: attachment; filename=$filename"); + header("Content-Type: text/plain; charset=utf-8"); + + print $header; + + foreach ($parent as $lid => $message) { + if (!isset($done[$lid])) { + if ($message['comment']) { + print '#: '. $message['comment'] ."\n"; + } + print 'msgid '. _locale_export_print($message['msgid']); + if (isset($message[1]['plural'])) { + print 'msgid_plural '. _locale_export_print($message[1]['msgid']); + if ($language) { + for ($i = 0; $i < $meta->plurals; $i++) { + print 'msgstr['. $i .'] '. _locale_export_print(_locale_export_remove_plural($message[${i}]['translation'])); + $done[$message[${i}]['plural']] = 1; + } + } + else { + print 'msgstr[0] ""'. "\n"; + print 'msgstr[1] ""'. "\n"; + $done[$message[0]['plural']] = 1; + $done[$message[1]['plural']] = 1; + } + } + else { + if ($language) { + print 'msgstr '. _locale_export_print($message['translation']); + } + else { + print 'msgstr ""'. "\n"; + } + } + print "\n"; + } + } + die(); +} + +/** + * Print out a string on multiple lines + */ +function _locale_export_print($str) { + $stri = addcslashes($str, "\0..\37\\\""); + $parts = array(); + + // Cut text into several lines + while ($stri != "") { + $i = strpos($stri, "\\n"); + if ($i === FALSE) { + $curstr = $stri; + $stri = ""; + } + else { + $curstr = substr($stri, 0, $i + 2); + $stri = substr($stri, $i + 2); + } + $curparts = explode("\n", _locale_export_wrap($curstr, 70)); + $parts = array_merge($parts, $curparts); + } + + if (count($parts) > 1) { + return "\"\"\n\"". implode("\"\n\"", $parts) ."\"\n"; + } + else { + return "\"$parts[0]\"\n"; + } +} + +/** + * Custom word wrapping for Portable Object (Template) files. + * + * @author Jacobo Tarrio + */ +function _locale_export_wrap($str, $len) { + $words = explode(' ', $str); + $ret = array(); + + $cur = ""; + $nstr = 1; + while (count($words)) { + $word = array_shift($words); + if ($nstr) { + $cur = $word; + $nstr = 0; + } + elseif (strlen("$cur $word") > $len) { + $ret[] = $cur . " "; + $cur = $word; + } + else { + $cur = "$cur $word"; + } + } + $ret[] = $cur; + + return implode("\n", $ret); +} + +/** + * Removes plural index information from a string + */ +function _locale_export_remove_plural($entry) { + return preg_replace('/(%count)\[[0-9]\]/', '\\1', $entry); +} + +/** + * List languages in search result table + */ +function _locale_string_language_list($translation) { + $languages = locale_supported_languages(FALSE, TRUE); + unset($languages['name']['en']); + $output = ''; + foreach ($languages['name'] as $key => $value) { + if (isset($translation[$key])) { + $output .= ($translation[$key] != '') ? $key .' ' : "$key "; + } + } + + return $output; +} + +/** + * Build object out of search criteria specified in request variables + */ +function _locale_string_seek_query() { + static $query = NULL; + + if (is_null($query)) { + $fields = array('string', 'language', 'searchin'); + $query = new StdClass; + if (is_array($_REQUEST['edit'])) { + foreach ($_REQUEST['edit'] as $key => $value) { + if (!empty($value) && in_array($key, $fields)) { + $query->$key = $value; + } + } + } + else { + foreach ($_REQUEST as $key => $value) { + if (!empty($value) && in_array($key, $fields)) { + $query->$key = strpos(',', $value) ? explode(',', $value) : $value; + } + } + } + } + return $query; +} + +/** + * Perform a string search and display results in a table + */ +function _locale_string_seek() { + // We have at least one criterion to match + if ($query = _locale_string_seek_query()) { + $join = "SELECT s.source, s.location, s.lid, t.translation, t.locale FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid "; + + $arguments = array(); + // Compute LIKE section + switch ($query->searchin) { + case 'translated': + $where = "WHERE (t.translation LIKE '%%%s%%' AND t.translation != '')"; + $orderby = "ORDER BY t.translation"; + $arguments[] = $query->string; + break; + case 'untranslated': + $where = "WHERE (s.source LIKE '%%%s%%' AND t.translation = '')"; + $orderby = "ORDER BY s.source"; + $arguments[] = $query->string; + break; + case 'all' : + default: + $where = "WHERE (s.source LIKE '%%%s%%' OR t.translation LIKE '%%%s%%')"; + $orderby = ''; + $arguments[] = $query->string; + $arguments[] = $query->string; + break; + } + + switch ($query->language) { + // Force search in source strings + case "en": + $sql = $join ." WHERE s.source LIKE '%%%s%%' ORDER BY s.source"; + $arguments = array($query->string); // $where is not used, discard its arguments + break; + // Search in all languages + case "all": + $sql = "$join $where $orderby"; + break; + // Some different language + default: + $sql = "$join $where AND t.locale = '%s' $orderby"; + $arguments[] = $query->language; + } + + $result = pager_query($sql, 50, 0, NULL, $arguments); + + $header = array(t('String'), t('Locales'), array('data' => t('Operations'), 'colspan' => '2')); + $arr = array(); + while ($locale = db_fetch_object($result)) { + $arr[$locale->lid]['locales'][$locale->locale] = $locale->translation; + $arr[$locale->lid]['location'] = $locale->location; + $arr[$locale->lid]['source'] = $locale->source; + } + foreach ($arr as $lid => $value) { + $rows[] = array(array('data' => check_plain(truncate_utf8($value['source'], 150, FALSE, TRUE)) .'
'. $value['location'] .''), array('data' => _locale_string_language_list($value['locales']), 'align' => 'center'), array('data' => l(t('edit'), "admin/locale/string/edit/$lid"), 'class' => 'nowrap'), array('data' => l(t('delete'), "admin/locale/string/delete/$lid"), 'class' => 'nowrap')); + } + + $request = array(); + if (count($query)) { + foreach ($query as $key => $value) { + $request[$key] = (is_array($value)) ? implode(',', $value) : $value; + } + } + + if (count($rows)) { + $output .= theme('table', $header, $rows); + } + if ($pager = theme('pager', NULL, 50, 0, $request)) { + $output .= $pager; + } + } + + return $output; +} + +// --------------------------------------------------------------------------------- +// List of some of the most common languages (administration only) + +/** + * Prepares the language code list for a select form item with only the unsupported ones + */ +function _locale_prepare_iso_list() { + $languages = locale_supported_languages(FALSE, TRUE); + $isocodes = _locale_get_iso639_list(); + foreach ($isocodes as $key => $value) { + if (isset($languages['name'][$key])) { + unset($isocodes[$key]); + continue; + } + if (count($value) == 2) { + $tname = t($value[0]); + $isocodes[$key] = ($tname == $value[1]) ? $tname : "$tname ($value[1])"; + } + else { + $isocodes[$key] = t($value[0]); + } + } + asort($isocodes); + return $isocodes; +} + +/** + * Some of the common languages with their English and native names + * + * Based on ISO 639 and http://people.w3.org/rishida/names/languages.html + */ +function _locale_get_iso639_list() { + return array( + "aa" => array("Afar"), + "ab" => array("Abkhazian", "аҧсуа бызшәа"), + "ae" => array("Avestan"), + "af" => array("Afrikaans"), + "ak" => array("Akan"), + "am" => array("Amharic", "አማርኛ"), + "ar" => array("Arabic", "العربية"), + "as" => array("Assamese"), + "av" => array("Avar"), + "ay" => array("Aymara"), + "az" => array("Azerbaijani", "azərbaycan"), + "ba" => array("Bashkir"), + "be" => array("Belarusian", "Беларуская"), + "bg" => array("Bulgarian", "Български"), + "bh" => array("Bihari"), + "bi" => array("Bislama"), + "bm" => array("Bambara", "Bamanankan"), + "bn" => array("Bengali"), + "bo" => array("Tibetan"), + "br" => array("Breton"), + "bs" => array("Bosnian", "Bosanski"), + "ca" => array("Catalan", "Català"), + "ce" => array("Chechen"), + "ch" => array("Chamorro"), + "co" => array("Corsican"), + "cr" => array("Cree"), + "cs" => array("Czech", "Čeština"), + "cu" => array("Old Slavonic"), + "cv" => array("Welsh", "Cymraeg"), + "cy" => array("Welch"), + "da" => array("Danish", "Dansk"), + "de" => array("German", "Deutsch"), + "dv" => array("Maldivian"), + "dz" => array("Bhutani"), + "ee" => array("Ewe", "Ɛʋɛ"), + "el" => array("Greek", "Ελληνικά"), + "en" => array("English"), + "eo" => array("Esperanto"), + "es" => array("Spanish", "Español"), + "et" => array("Estonian", "Eesti"), + "eu" => array("Basque", "Euskera"), + "fa" => array("Persian", "فارسی"), + "ff" => array("Fulah", "Fulfulde"), + "fi" => array("Finnish", "Suomi"), + "fj" => array("Fiji"), + "fo" => array("Faeroese"), + "fr" => array("French", "Français"), + "fy" => array("Frisian", "Frysk"), + "ga" => array("Irish", "Gaeilge"), + "gd" => array("Scots Gaelic"), + "gl" => array("Galician", "Galego"), + "gn" => array("Guarani"), + "gu" => array("Gujarati"), + "gv" => array("Manx"), + "ha" => array("Hausa"), + "he" => array("Hebrew", "עברית"), + "hi" => array("Hindi", "हिन्दी"), + "ho" => array("Hiri Motu"), + "hr" => array("Croatian", "Hrvatski"), + "hu" => array("Hungarian", "Magyar"), + "hy" => array("Armenian", "Հայերեն"), + "hz" => array("Herero"), + "ia" => array("Interlingua"), + "id" => array("Indonesian", "Bahasa Indonesia"), + "ie" => array("Interlingue"), + "ig" => array("Igbo"), + "ik" => array("Inupiak"), + "is" => array("Icelandic", "Íslenska"), + "it" => array("Italian", "Italiano"), + "iu" => array("Inuktitut"), + "ja" => array("Japanese", "日本語"), + "jv" => array("Javanese"), + "ka" => array("Georgian"), + "kg" => array("Kongo"), + "ki" => array("Kikuyu"), + "kj" => array("Kwanyama"), + "kk" => array("Kazakh", "Қазақ"), + "kl" => array("Greenlandic"), + "km" => array("Cambodian"), + "kn" => array("Kannada", "ಕನ್ನಡ"), + "ko" => array("Korean", "한국어"), + "kr" => array("Kanuri"), + "ks" => array("Kashmiri"), + "ku" => array("Kurdish", "Kurdî"), + "kv" => array("Komi"), + "kw" => array("Cornish"), + "ky" => array("Kirghiz", "Кыргыз"), + "la" => array("Latin", "Latina"), + "lb" => array("Luxembourgish"), + "lg" => array("Luganda"), + "ln" => array("Lingala"), + "lo" => array("Laothian"), + "lt" => array("Lithuanian", "Lietuviškai"), + "lv" => array("Latvian", "Latviešu"), + "mg" => array("Malagasy"), + "mh" => array("Marshallese"), + "mi" => array("Maori"), + "mk" => array("Macedonian", "Македонски"), + "ml" => array("Malayalam", "മലയാളം"), + "mn" => array("Mongolian"), + "mo" => array("Moldavian"), + "mr" => array("Marathi"), + "ms" => array("Malay", "Bahasa Melayu"), + "mt" => array("Maltese", "Malti"), + "my" => array("Burmese"), + "na" => array("Nauru"), + "nd" => array("North Ndebele"), + "ne" => array("Nepali"), + "ng" => array("Ndonga"), + "nl" => array("Dutch", "Nederlands"), + "no" => array("Norwegian", "Norsk"), + "nr" => array("South Ndebele"), + "nv" => array("Navajo"), + "ny" => array("Chichewa"), + "oc" => array("Occitan"), + "om" => array("Oromo"), + "or" => array("Oriya"), + "os" => array("Ossetian"), + "pa" => array("Punjabi"), + "pi" => array("Pali"), + "pl" => array("Polish", "Polski"), + "ps" => array("Pashto", "پښتو"), + "pt" => array("Portuguese", "Português"), + "qu" => array("Quechua"), + "rm" => array("Rhaeto-Romance"), + "rn" => array("Kirundi"), + "ro" => array("Romanian", "Română"), + "ru" => array("Russian", "Русский"), + "rw" => array("Kinyarwanda"), + "sa" => array("Sanskrit"), + "sc" => array("Sardinian"), + "sd" => array("Sindhi"), + "se" => array("Northern Sami"), + "sg" => array("Sango"), + "sh" => array("Serbo-Croatian"), + "si" => array("Singhalese"), + "sk" => array("Slovak", "Slovenčina"), + "sl" => array("Slovenian", "Slovenščina"), + "sm" => array("Samoan"), + "sn" => array("Shona"), + "so" => array("Somali"), + "sq" => array("Albanian", "Shqip"), + "sr" => array("Serbian", "Српски"), + "ss" => array("Siswati"), + "st" => array("Sesotho"), + "su" => array("Sudanese"), + "sv" => array("Swedish", "Svenska"), + "sw" => array("Swahili", "Kiswahili"), + "ta" => array("Tamil", "தமிழ்"), + "te" => array("Telugu", "తెలుగు"), + "tg" => array("Tajik"), + "th" => array("Thai", "ภาษาไทย"), + "ti" => array("Tigrinya"), + "tk" => array("Turkmen"), + "tl" => array("Tagalog"), + "tn" => array("Setswana"), + "to" => array("Tonga"), + "tr" => array("Turkish", "Türkçe"), + "ts" => array("Tsonga"), + "tt" => array("Tatar", "Tatarça"), + "tw" => array("Twi"), + "ty" => array("Tahitian"), + "ug" => array("Uighur"), + "uk" => array("Ukrainian", "Українська"), + "ur" => array("Urdu", "اردو"), + "uz" => array("Uzbek", "o'zbek"), + "ve" => array("Venda"), + "vi" => array("Vietnamese", "Tiếng Việt"), + "wo" => array("Wolof"), + "xh" => array("Xhosa", "isiXhosa"), + "yi" => array("Yiddish"), + "yo" => array("Yoruba", "Yorùbá"), + "za" => array("Zhuang"), + "zh-hans" => array("Chinese, Simplified", "简体中文"), + "zh-hant" => array("Chinese, Traditional", "繁體中文"), + "zu" => array("Zulu", "isiZulu"), + ); +} diff --git a/includes/menu.inc b/includes/menu.inc new file mode 100644 index 0000000..c5fdd45 --- /dev/null +++ b/includes/menu.inc @@ -0,0 +1,1362 @@ + $item['description'])). + * - 'children' - A linear list of the menu ID's of this item's children. + * + * Menu ID 0 is the "root" of the menu. The children of this item are the + * menus themselves (they will have no associated path). Menu ID 1 will + * always be one of these children; it is the default "Navigation" menu. + */ +function menu_get_menu() { + global $_menu; + global $user; + global $locale; + + if (!isset($_menu['items'])) { + // _menu_build() may indirectly call this function, so prevent infinite loops. + $_menu['items'] = array(); + + $cid = "menu:$user->uid:$locale"; + if ($cached = cache_get($cid)) { + $_menu = unserialize($cached->data); + } + else { + _menu_build(); + // Cache the menu structure for this user, to expire after one day. + cache_set($cid, serialize($_menu), time() + (60 * 60 * 24)); + } + + // Make sure items that cannot be cached are added. + _menu_append_contextual_items(); + + // Reset the cached $menu in menu_get_item(). + menu_get_item(NULL, NULL, TRUE); + } + + return $_menu; +} + +/** + * Return the local task tree. + * + * Unlike the rest of the menu structure, the local task tree cannot be cached + * nor determined too early in the page request, because the user's current + * location may be changed by a menu_set_location() call, and the tasks shown + * (just as the breadcrumb trail) need to reflect the changed location. + */ +function menu_get_local_tasks() { + global $_menu; + + // Don't cache the local task tree, as it varies by location and tasks are + // allowed to be dynamically determined. + if (!isset($_menu['local tasks'])) { + // _menu_build_local_tasks() may indirectly call this function, so prevent + // infinite loops. + $_menu['local tasks'] = array(); + $pid = menu_get_active_nontask_item(); + if (!_menu_build_local_tasks($pid)) { + // If the build returned FALSE, the tasks need not be displayed. + $_menu['local tasks'][$pid]['children'] = array(); + } + } + + return $_menu['local tasks']; +} + +/** + * Retrieves the menu item specified by $mid, or by $path if $mid is not given. + * + * @param $mid + * The menu ID of the menu item to retrieve. + * @param $path + * The internal path of the menu item to retrieve. Defaults to NULL. Only + * used if $mid is not set. + * @param $reset + * Optional flag that resets the static variable cache of the menu tree, if + * set to TRUE. Default is FALSE. + * + * @return + * The menu item found in the site menu, or an empty array if none could be + * found. + */ +function menu_get_item($mid, $path = NULL, $reset = FALSE) { + static $menu; + + if (!isset($menu) || $reset) { + $menu = menu_get_menu(); + } + + if (isset($mid)) { + return $menu['items'][$mid]; + } + + if (isset($path)) { + return $menu['items'][$menu['path index'][$path]]; + } + + return array(); +} + +/** + * Retrieves the menu ID and title of all root menus. + * + * @return + * Array containing all menus (but not menu items), in the form mid => title. + */ +function menu_get_root_menus() { + $menu = menu_get_menu(); + $root_menus = array(); + + foreach ($menu['items'][0]['children'] as $mid) { + $root_menus[$mid] = $menu['items'][$mid]['title']; + } + + return $root_menus; +} + +/** + * Change the current menu location of the user. + * + * Frequently, modules may want to make a page or node act as if it were + * in the menu tree somewhere, even though it was not registered in a + * hook_menu() implementation. If the administrator has rearranged the menu, + * the newly set location should respect this in the breadcrumb trail and + * expanded/collapsed status of menu items in the tree. This function + * allows this behavior. + * + * @param $location + * An array specifying a complete or partial breadcrumb trail for the + * new location, in the same format as the return value of hook_menu(). + * The last element of this array should be the new location itself. + * + * This function will set the new breadcrumb trail to the passed-in value, + * but if any elements of this trail are visible in the site tree, the + * trail will be "spliced in" to the existing site navigation at that point. + */ +function menu_set_location($location) { + global $_menu; + $temp_id = min(array_keys($_menu['items'])) - 1; + $prev_id = 0; + + // Don't allow this function to change the actual current path, just the + // position in the menu tree. + $location[count($location) - 1]['path'] = $_GET['q']; + + foreach (array_reverse($location) as $item) { + if (isset($_menu['path index'][$item['path']])) { + $mid = $_menu['path index'][$item['path']]; + if (isset($_menu['visible'][$mid])) { + // Splice in the breadcrumb at this location. + if ($prev_id) { + $_menu['items'][$prev_id]['pid'] = $mid; + } + $prev_id = 0; + break; + } + else { + // A hidden item; show it, but only temporarily. + $_menu['items'][$mid]['type'] |= MENU_VISIBLE_IN_BREADCRUMB; + if ($prev_id) { + $_menu['items'][$prev_id]['pid'] = $mid; + } + $prev_id = $mid; + } + } + else { + $item['type'] |= MENU_VISIBLE_IN_BREADCRUMB; + if ($prev_id) { + $_menu['items'][$prev_id]['pid'] = $temp_id; + } + $_menu['items'][$temp_id] = $item; + $_menu['path index'][$item['path']] = $temp_id; + + $prev_id = $temp_id; + $temp_id--; + } + } + + if ($prev_id) { + // Didn't find a home, so attach this to the main navigation menu. + $_menu['items'][$prev_id]['pid'] = 1; + } + + $final_item = array_pop($location); + menu_set_active_item($final_item['path']); +} + +/** + * Execute the handler associated with the active menu item. + * + * This is called early in the page request. The active menu item is at + * this point determined exclusively by the URL. The handler that is called + * here may, as a side effect, change the active menu item so that later + * menu functions (that display the menus and breadcrumbs, for example) + * act as if the user were in a different location on the site. + */ +function menu_execute_active_handler() { + if (_menu_site_is_offline()) { + return MENU_SITE_OFFLINE; + } + + $menu = menu_get_menu(); + + // Determine the menu item containing the callback. + $path = $_GET['q']; + while ($path && !isset($menu['callbacks'][$path])) { + $path = substr($path, 0, strrpos($path, '/')); + } + + if (!isset($menu['callbacks'][$path])) { + return MENU_NOT_FOUND; + } + + if (!function_exists($menu['callbacks'][$path]['callback'])) { + return MENU_NOT_FOUND; + } + + if (!_menu_item_is_accessible(menu_get_active_item())) { + return MENU_ACCESS_DENIED; + } + + // We found one, and are allowed to execute it. + $arguments = isset($menu['callbacks'][$path]['callback arguments']) ? $menu['callbacks'][$path]['callback arguments'] : array(); + $arg = substr($_GET['q'], strlen($path) + 1); + if (strlen($arg)) { + $arguments = array_merge($arguments, explode('/', $arg)); + } + + return call_user_func_array($menu['callbacks'][$path]['callback'], $arguments); +} + +/** + * Returns the ID of the active menu item. + */ +function menu_get_active_item() { + return menu_set_active_item(); +} + +/** + * Sets the path of the active menu item. + */ +function menu_set_active_item($path = NULL) { + static $stored_mid; + + if (!isset($stored_mid) || isset($path)) { + $menu = menu_get_menu(); + if (!isset($path)) { + $path = $_GET['q']; + } + else { + $_GET['q'] = $path; + } + + while ($path && !isset($menu['path index'][$path])) { + $path = substr($path, 0, strrpos($path, '/')); + } + $stored_mid = isset($menu['path index'][$path]) ? $menu['path index'][$path] : 0; + + // Search for default local tasks to activate instead of this item. + $continue = TRUE; + while ($continue) { + $continue = FALSE; + if (isset($menu['items'][$stored_mid]['children'])) { + foreach ($menu['items'][$stored_mid]['children'] as $cid) { + if ($menu['items'][$cid]['type'] & MENU_LINKS_TO_PARENT) { + $stored_mid = $cid; + $continue = TRUE; + } + } + } + } + + // Reset the cached $menu in menu_get_item(). + menu_get_item(NULL, NULL, TRUE); + } + + return $stored_mid; +} + +/** + * Returns the ID of the current menu item or, if the current item is a + * local task, the menu item to which this task is attached. + */ +function menu_get_active_nontask_item() { + $mid = menu_get_active_item(); + + // Find the first non-task item: + while ($mid) { + $item = menu_get_item($mid); + + if (!($item['type'] & MENU_IS_LOCAL_TASK)) { + return $mid; + } + + $mid = $item['pid']; + } +} + +/** + * Returns the title of the active menu item. + */ +function menu_get_active_title() { + if ($mid = menu_get_active_nontask_item()) { + $item = menu_get_item($mid); + return $item['title']; + } +} + +/** + * Returns the help associated with the active menu item. + */ +function menu_get_active_help() { + $path = $_GET['q']; + $output = ''; + + if (!_menu_item_is_accessible(menu_get_active_item())) { + // Don't return help text for areas the user cannot access. + return; + } + + foreach (module_list() as $name) { + if (module_hook($name, 'help')) { + if ($temp = module_invoke($name, 'help', $path)) { + $output .= $temp . "\n"; + } + if (module_hook('help', 'page')) { + if (substr($path, 0, 6) == "admin/") { + if (module_invoke($name, 'help', 'admin/help#' . substr($path, 6))) { + $output .= theme("more_help_link", url('admin/help/' . substr($path, 6))); + } + } + } + } + } + return $output; +} + +/** + * Returns an array of rendered menu items in the active breadcrumb trail. + */ +function menu_get_active_breadcrumb() { + + // No breadcrumb for the front page. + if (drupal_is_front_page()) { + return array(); + } + + $links[] = l(t('Home'), variable_get('site_frontpage', 'node')); + + $trail = _menu_get_active_trail(); + foreach ($trail as $mid) { + $item = menu_get_item($mid); + if ($item['type'] & MENU_VISIBLE_IN_BREADCRUMB) { + $links[] = menu_item_link($mid); + } + } + + // The last item in the trail is the page title; don't display it here. + array_pop($links); + + return $links; +} + +/** + * Returns true when the menu item is in the active trail. + */ +function menu_in_active_trail($mid) { + $trail = _menu_get_active_trail(); + + return in_array($mid, $trail); +} + +/** + * Returns true when the menu item is in the active trail within a + * specific subsection of the menu tree. + * + * @param $mid + * The menu item being considered. + * @param $pid + * The root of the subsection of the menu tree in which to look. + */ +function menu_in_active_trail_in_submenu($mid, $pid) { + $trail = _menu_get_active_trail_in_submenu($pid); + + if (!$trail) { + return FALSE; + } + + return in_array($mid, $trail); +} + +/** + * Populate the database representation of the menu. + * + * This need only be called at the start of pages that modify the menu. + */ +function menu_rebuild() { + // Clear the page cache, so that changed menus are reflected for anonymous users. + cache_clear_all(); + // Also clear the menu cache. + cache_clear_all('menu:', TRUE); + + _menu_build(); + + if (module_exist('menu')) { + $menu = menu_get_menu(); + + // Fill a queue of new menu items which are modifiable. + $new_items = array(); + foreach ($menu['items'] as $mid => $item) { + if ($mid < 0 && ($item['type'] & MENU_MODIFIABLE_BY_ADMIN)) { + $new_items[$mid] = $item; + } + } + + $old_count = -1; + // Save the new items updating the pids in each iteration + while (($c = count($new_items)) && ($c != $old_count)) { + $old_count = count($new_items); + foreach($new_items as $mid => $item) { + // If the item has a valid parent, save it + if ($item['pid'] >= 0) { + // The new menu ID gets passed back by reference as $item['mid'] + menu_save_item($item); + // Fix parent IDs for the children of the menu item just saved + if ($item['children']) { + foreach ($item['children'] as $child) { + if (isset($new_items[$child])) { + $new_items[$child]['pid'] = $item['mid']; + } + } + } + // remove the item + unset($new_items[$mid]); + } + } + } + // Rebuild the menu to account for the changes. + _menu_build(); + } + + // Reset the cached $menu in menu_get_item(). + menu_get_item(NULL, NULL, TRUE); + +} + +/** + * Generate the HTML for a menu tree. + * + * @param $pid + * The parent id of the menu. + * + * @ingroup themeable + */ +function theme_menu_tree($pid = 1) { + if ($tree = menu_tree($pid)) { + return "\n
    \n". $tree ."\n
\n"; + } +} + +/** + * Returns a rendered menu tree. + * + * @param $pid + * The parent id of the menu. + */ +function menu_tree($pid = 1) { + $menu = menu_get_menu(); + $output = ''; + + if (isset($menu['visible'][$pid]) && $menu['visible'][$pid]['children']) { + foreach ($menu['visible'][$pid]['children'] as $mid) { + $type = isset($menu['visible'][$mid]['type']) ? $menu['visible'][$mid]['type'] : NULL; + $children = isset($menu['visible'][$mid]['children']) ? $menu['visible'][$mid]['children'] : NULL; + $output .= theme('menu_item', $mid, menu_in_active_trail($mid) || ($type & MENU_EXPANDED) ? theme('menu_tree', $mid) : '', count($children) == 0); + } + } + + return $output; +} + +/** + * Generate the HTML output for a single menu item. + * + * @param $mid + * The menu id of the item. + * @param $children + * A string containing any rendered child items of this menu. + * @param $leaf + * A boolean indicating whether this menu item is a leaf. + * + * @ingroup themeable + */ +function theme_menu_item($mid, $children = '', $leaf = TRUE) { + return '
  • '. menu_item_link($mid) . $children ."
    • \n"; +} + +/** + * Generate the HTML representing a given menu item ID. + * + * @param $item + * The menu item to render. + * @param $link_item + * The menu item which should be used to find the correct path. + * + * @ingroup themeable + */ +function theme_menu_item_link($item, $link_item) { + return l($item['title'], $link_item['path'], isset($item['description']) ? array('title' => $item['description']) : array()); +} + +/** + * Returns the rendered link to a menu item. + * + * @param $mid + * The menu item id to render. + */ +function menu_item_link($mid) { + $item = menu_get_item($mid); + $link_item = $item; + + while ($link_item['type'] & MENU_LINKS_TO_PARENT) { + $link_item = menu_get_item($link_item['pid']); + } + + return theme('menu_item_link', $item, $link_item); +} + +/** + * Returns the rendered local tasks. The default implementation renders + * them as tabs. + * + * @ingroup themeable + */ +function theme_menu_local_tasks() { + $output = ''; + + if ($primary = menu_primary_local_tasks()) { + $output .= "
      \n". $primary ."
    \n"; + } + if ($secondary = menu_secondary_local_tasks()) { + $output .= "
      \n". $secondary ."
    \n"; + } + + return $output; +} + +/** + * Returns the rendered HTML of the primary local tasks. + */ +function menu_primary_local_tasks() { + $local_tasks = menu_get_local_tasks(); + $pid = menu_get_active_nontask_item(); + $output = ''; + + if (count($local_tasks[$pid]['children'])) { + foreach ($local_tasks[$pid]['children'] as $mid) { + $output .= theme('menu_local_task', $mid, menu_in_active_trail($mid), TRUE); + } + } + + return $output; +} + +/** + * Returns the rendered HTML of the secondary local tasks. + */ +function menu_secondary_local_tasks() { + $local_tasks = menu_get_local_tasks(); + $pid = menu_get_active_nontask_item(); + $output = ''; + + if (count($local_tasks[$pid]['children'])) { + foreach ($local_tasks[$pid]['children'] as $mid) { + if (menu_in_active_trail($mid) && count($local_tasks[$mid]['children']) > 1) { + foreach ($local_tasks[$mid]['children'] as $cid) { + $output .= theme('menu_local_task', $cid, menu_in_active_trail($cid), FALSE); + } + } + } + } + + return $output; +} + +/** + * Generate the HTML representing a given menu item ID as a tab. + * + * @param $mid + * The menu ID to render. + * @param $active + * Whether this tab or a subtab is the active menu item. + * @param $primary + * Whether this tab is a primary tab or a subtab. + * + * @ingroup themeable + */ +function theme_menu_local_task($mid, $active, $primary) { + if ($active) { + return '
  • '. menu_item_link($mid) ."
    • \n"; + } + else { + return '
  • '. menu_item_link($mid) ."
    • \n"; + } +} + +/** + * Returns an array containing the primary links. + * Can optionally descend from the root of the Primary links menu towards the + * current node for a specified number of levels and return that submenu. + * Used to generate a primary/secondary menu from different levels of one menu. + * + * @param $start_level + * This optional parameter can be used to retrieve a context-sensitive array + * of links at $start_level levels deep into the Primary links menu. + * The default is to return the top-level links. + * @param $pid + * The parent menu ID from which to search for children. Defaults to the + * menu_primary_menu setting. + * @return An array containing the themed links as the values. The keys of + * the array contain some extra encoded information about the results. + * The format of the key is {level}-{num}{-active}. + * level is the depth within the menu tree of this list. + * num is the number within this array, used only to make the key unique. + * -active is appended if this element is in the active trail. + */ +function menu_primary_links($start_level = 1, $pid = 0) { + if (!module_exist('menu')) { + return NULL; + } + if (!$pid) { + $pid = variable_get('menu_primary_menu', 0); + } + if (!$pid) { + return NULL; + } + + if ($start_level < 1) { + $start_level = 1; + } + + if ($start_level > 1) { + $trail = _menu_get_active_trail_in_submenu($pid); + if (!$trail) { + return NULL; + } + else { + $pid = $trail[$start_level - 1]; + } + } + + $menu = menu_get_menu(); + $links = array(); + if ($pid && is_array($menu['visible'][$pid]) && isset($menu['visible'][$pid]['children'])) { + $count = 1; + foreach ($menu['visible'][$pid]['children'] as $cid) { + $index = "menu-$start_level-$count"; + if (menu_in_active_trail_in_submenu($cid, $pid)) { + $index .= "-active"; + } + $links[$index] = menu_item_link($cid); + $count++; + } + } + + // Special case - provide link to admin/menu if primary links is empty. + if (empty($links) && $start_level == 1 && $pid == variable_get('menu_primary_menu', 0)) { + $links['1-1'] = l(t('edit primary links'),'admin/menu'); + } + + return $links; +} + +/** + * Returns an array containing the secondary links. + * Secondary links can be either a second level of the Primary links + * menu or generated from their own menu. + */ +function menu_secondary_links() { + $msm = variable_get('menu_secondary_menu', 0); + if ($msm == 0) { + return NULL; + } + + if ($msm == variable_get('menu_primary_menu', 0)) { + return menu_primary_links(2, $msm); + } + + return menu_primary_links(1, $msm); +} + +/** + * Returns the themed HTML for primary and secondary links. + * Note that this function is overridden by most core themes because + * those themes display links in "link | link" format, not from a list. + * Also note that by default links rendered with this function are + * displayed with the same CSS as is used for the local tasks. + * If a theme wishes to render links from a ul it is expected that + * the theme will provide suitable CSS. + * + * @param $links + * An array containing links to render. + * @return + * A string containing the themed links. + * + * @ingroup themeable + */ +function theme_menu_links($links) { + if (!count($links)) { + return ''; + } + $level_tmp = explode('-', key($links)); + $level = $level_tmp[0]; + $output = "
      \n"; + foreach ($links as $index => $link) { + $output .= ' $item) { + if (isset($item['path']) && $item['path'] == $path) { + $trails[$count] = array(); + $mid = $key; + while ($mid && $menu['items'][$mid]) { + array_unshift($trails[$count], $mid); + $mid = $menu['items'][$mid]['pid']; + } + $count ++; + } + } + $path = substr($path, 0, strrpos($path, '/')); + } + } + + if ($trails) { + foreach ($trails as $trail) { + $count_trail = count($trail); + for ($i = 0; $i < $count_trail; $i++) { + if ($trail[$i] == $pid) { + // Return a trail from $pid down to the current page inclusive. + for ( ; $i < $count_trail; $i++) { + $subtrail[] = $trail[$i]; + } + return $subtrail; + } + } + } + } + + return NULL; +} + +/** + * Comparator routine for use in sorting menu items. + */ +function _menu_sort($a, $b) { + $menu = menu_get_menu(); + + $a = &$menu['items'][$a]; + $b = &$menu['items'][$b]; + + if ($a['weight'] < $b['weight']) { + return -1; + } + elseif ($a['weight'] > $b['weight']) { + return 1; + } + elseif (isset($a['title']) && isset($b['title'])) { + return strnatcasecmp($a['title'], $b['title']); + } + else { + return 1; + } +} + +/** + * Build the menu by querying both modules and the database. + */ +function _menu_build() { + global $_menu; + global $user; + + // Start from a clean slate. + $_menu = array(); + + $_menu['path index'] = array(); + // Set up items array, including default "Navigation" menu. + $_menu['items'] = array( + 0 => array('path' => '', 'title' => '', 'type' => MENU_IS_ROOT), + 1 => array('pid' => 0, 'path' => '', 'title' => t('Navigation'), 'weight' => -50, 'access' => TRUE, 'type' => MENU_IS_ROOT | MENU_VISIBLE_IN_TREE) + ); + $_menu['callbacks'] = array(); + + // Build a sequential list of all menu items. + $menu_item_list = module_invoke_all('menu', TRUE); + + // Menu items not in the DB get temporary negative IDs. + $temp_mid = -1; + + foreach ($menu_item_list as $item) { + if (!isset($item['path'])) { + $item['path'] = ''; + } + if (!isset($item['type'])) { + $item['type'] = MENU_NORMAL_ITEM; + } + if (!isset($item['weight'])) { + $item['weight'] = 0; + } + $mid = $temp_mid; + if (isset($_menu['path index'][$item['path']])) { + // Newer menu items overwrite older ones. + unset($_menu['items'][$_menu['path index'][$item['path']]]); + } + if (isset($item['callback'])) { + $_menu['callbacks'][$item['path']] = array('callback' => $item['callback']); + if (isset($item['callback arguments'])) { + $_menu['callbacks'][$item['path']]['callback arguments'] = $item['callback arguments']; + } + } + unset($item['callback']); + unset($item['callback arguments']); + $_menu['items'][$mid] = $item; + $_menu['path index'][$item['path']] = $mid; + + $temp_mid--; + } + + // Now fetch items from the DB, reassigning menu IDs as needed. + if (module_exist('menu')) { + $result = db_query(db_rewrite_sql('SELECT m.mid, m.* FROM {menu} m ORDER BY m.mid ASC', 'm', 'mid')); + while ($item = db_fetch_object($result)) { + // Handle URL aliases if entered in menu administration. + if (!isset($_menu['path index'][$item->path])) { + $item->path = drupal_get_normal_path($item->path); + } + if (isset($_menu['path index'][$item->path])) { + // The path is already declared. + $old_mid = $_menu['path index'][$item->path]; + if ($old_mid < 0) { + // It had a temporary ID, so use a permanent one. + $_menu['items'][$item->mid] = $_menu['items'][$old_mid]; + unset($_menu['items'][$old_mid]); + $_menu['path index'][$item->path] = $item->mid; + } + else { + // It has a permanent ID. Only replace with non-custom menu items. + if ($item->type & MENU_CREATED_BY_ADMIN) { + $_menu['items'][$item->mid] = array('path' => $item->path); + } + else { + // Leave the old item around as a shortcut to this one. + $_menu['items'][$item->mid] = $_menu['items'][$old_mid]; + $_menu['path index'][$item->path] = $item->mid; + } + } + } + else { + // The path was not declared, so this is a custom item or an orphaned one. + if ($item->type & MENU_CREATED_BY_ADMIN) { + $_menu['items'][$item->mid] = array('path' => $item->path); + if (!empty($item->path)) { + $_menu['path index'][$item->path] = $item->mid; + } + } + } + + // If the administrator has changed the item, reflect the change. + if ($item->type & MENU_MODIFIED_BY_ADMIN) { + $_menu['items'][$item->mid]['title'] = $item->title; + $_menu['items'][$item->mid]['description'] = $item->description; + $_menu['items'][$item->mid]['pid'] = $item->pid; + $_menu['items'][$item->mid]['weight'] = $item->weight; + $_menu['items'][$item->mid]['type'] = $item->type; + } + } + } + + // Associate parent and child menu items. + _menu_find_parents($_menu['items']); + + // Prepare to display trees to the user as required. + _menu_build_visible_tree(); +} + +/** + * Determine whether the given menu item is accessible to the current user. + * + * Use this instead of just checking the "access" property of a menu item + * to properly handle items with fall-through semantics. + */ +function _menu_item_is_accessible($mid) { + $menu = menu_get_menu(); + + // Follow the path up to find the first "access" attribute. + $path = isset($menu['items'][$mid]['path']) ? $menu['items'][$mid]['path'] : NULL; + while ($path && (!isset($menu['path index'][$path]) || !isset($menu['items'][$menu['path index'][$path]]['access']))) { + $path = substr($path, 0, strrpos($path, '/')); + } + if (empty($path)) { + // Items without any access attribute up the chain are denied, unless they + // were created by the admin. They most likely point to non-Drupal directories + // or to an external URL and should be allowed. + return $menu['items'][$mid]['type'] & MENU_CREATED_BY_ADMIN; + } + return $menu['items'][$menu['path index'][$path]]['access']; +} + +/** + * Find all visible items in the menu tree, for ease in displaying to user. + * + * Since this is only for display, we only need title, path, and children + * for each item. + */ +function _menu_build_visible_tree($pid = 0) { + global $_menu; + + if (isset($_menu['items'][$pid])) { + $parent = $_menu['items'][$pid]; + + $children = array(); + if (isset($parent['children'])) { + usort($parent['children'], '_menu_sort'); + foreach ($parent['children'] as $mid) { + $children = array_merge($children, _menu_build_visible_tree($mid)); + } + } + $visible = ($parent['type'] & MENU_VISIBLE_IN_TREE) || + ($parent['type'] & MENU_VISIBLE_IF_HAS_CHILDREN && count($children) > 0); + $allowed = _menu_item_is_accessible($pid); + + if (($parent['type'] & MENU_IS_ROOT) || ($visible && $allowed)) { + $_menu['visible'][$pid] = array('title' => $parent['title'], 'path' => $parent['path'], 'children' => $children, 'type' => $parent['type']); + foreach ($children as $mid) { + $_menu['visible'][$mid]['pid'] = $pid; + } + return array($pid); + } + else { + return $children; + } + } + + return array(); +} + +/** + * Account for menu items that are only defined at certain paths, so will not + * be cached. + * + * We don't support the full range of menu item options for these menu items. We + * don't support MENU_VISIBLE_IF_HAS_CHILDREN, and we require parent items to be + * declared before their children. + */ +function _menu_append_contextual_items() { + global $_menu; + + // Build a sequential list of all menu items. + $menu_item_list = module_invoke_all('menu', FALSE); + + // Menu items not in the DB get temporary negative IDs. + $temp_mid = min(array_keys($_menu['items'])) - 1; + $new_items = array(); + + foreach ($menu_item_list as $item) { + if (isset($item['callback'])) { + $_menu['callbacks'][$item['path']] = array('callback' => $item['callback']); + if (isset($item['callback arguments'])) { + $_menu['callbacks'][$item['path']]['callback arguments'] = $item['callback arguments']; + } + } + unset($item['callback']); + unset($item['callback arguments']); + if (!isset($_menu['path index'][$item['path']])) { + if (!isset($item['path'])) { + $item['path'] = ''; + } + if (!isset($item['type'])) { + $item['type'] = MENU_NORMAL_ITEM; + } + if (!isset($item['weight'])) { + $item['weight'] = 0; + } + $_menu['items'][$temp_mid] = $item; + $_menu['path index'][$item['path']] = $temp_mid; + $new_items[$temp_mid] = $item; + $temp_mid--; + } + else { + $mid = $_menu['path index'][$item['path']]; + if ($_menu['items'][$mid]['type'] & MENU_CREATED_BY_ADMIN) { + $_menu['items'][$mid]['access'] = $item['access']; + if (isset($_menu['items'][$mid]['callback'])) { + $_menu['items'][$mid]['callback'] = $item['callback']; + } + if (isset($_menu['items'][$mid]['callback arguments'])) { + $_menu['items'][$mid]['callback arguments'] = $item['callback arguments']; + } + } + } + } + + // Establish parent-child relationships. + _menu_find_parents($new_items); + + // Add new items to the visible tree if necessary. + foreach ($new_items as $mid => $item) { + $item = $_menu['items'][$mid]; + if (($item['type'] & MENU_VISIBLE_IN_TREE) && _menu_item_is_accessible($mid)) { + $pid = $item['pid']; + while ($pid && !isset($_menu['visible'][$pid])) { + $pid = $_menu['items'][$pid]['pid']; + } + $_menu['visible'][$mid] = array('title' => $item['title'], 'path' => $item['path'], 'pid' => $pid); + $_menu['visible'][$pid]['children'][] = $mid; + usort($_menu['visible'][$pid]['children'], '_menu_sort'); + } + } +} + +/** + * Establish parent-child relationships. + */ +function _menu_find_parents(&$items) { + global $_menu; + + foreach ($items as $mid => $item) { + if (!isset($item['pid'])) { + // Parent's location has not been customized, so figure it out using the path. + $parent = $item['path']; + if ($parent) { + do { + $parent = substr($parent, 0, strrpos($parent, '/')); + } + while ($parent && !isset($_menu['path index'][$parent])); + } + + $pid = $parent ? $_menu['path index'][$parent] : 1; + $_menu['items'][$mid]['pid'] = $pid; + } + else { + $pid = $item['pid']; + } + + // Don't make root a child of itself. + if ($mid) { + if (isset ($_menu['items'][$pid])) { + $_menu['items'][$pid]['children'][] = $mid; + } + else { + // If parent is missing, it is a menu item that used to be defined + // but is no longer. Default to a root-level "Navigation" menu item. + $_menu['items'][1]['children'][] = $mid; + } + } + } +} + +/** + * Find all the items in the current local task tree. + * + * Since this is only for display, we only need title, path, and children + * for each item. + * + * At the close of this function, $_menu['local tasks'] is populated with the + * menu items in the local task tree. + * + * @return + * TRUE if the local task tree is forked. It does not need to be displayed + * otherwise. + */ +function _menu_build_local_tasks($pid) { + global $_menu; + + $forked = FALSE; + + if (isset($_menu['items'][$pid])) { + $parent = $_menu['items'][$pid]; + + $children = array(); + if (isset($parent['children'])) { + foreach ($parent['children'] as $mid) { + if (($_menu['items'][$mid]['type'] & MENU_IS_LOCAL_TASK) && _menu_item_is_accessible($mid)) { + $children[] = $mid; + // Beware short-circuiting || operator! + $forked = _menu_build_local_tasks($mid) || $forked; + } + } + } + usort($children, '_menu_sort'); + $forked = $forked || count($children) > 1; + + $_menu['local tasks'][$pid] = array('title' => $parent['title'], 'path' => $parent['path'], 'children' => $children); + foreach ($children as $mid) { + $_menu['local tasks'][$mid]['pid'] = $pid; + } + } + + return $forked; +} + +/** + * Returns TRUE if the site is off-line for maintenance. + */ +function _menu_site_is_offline() { + // Check if site is set to off-line mode + if (variable_get('site_offline', 0)) { + // Check if the user has administration privileges + if (!user_access('administer site configuration')) { + // Check if this is an attempt to login + if (drupal_get_normal_path($_GET['q']) != 'user') { + return TRUE; + } + } + else { + $offline_message = t('Operating in off-line mode.'); + $messages = drupal_set_message(); + // Ensure that the off-line message is displayed only once [allowing for page redirects]. + if (!isset($messages) || !isset($messages['status']) || !in_array($offline_message, $messages['status'])) { + drupal_set_message($offline_message); + } + } + } + return FALSE; +} \ No newline at end of file diff --git a/includes/module.inc b/includes/module.inc new file mode 100644 index 0000000..7bdec0f --- /dev/null +++ b/includes/module.inc @@ -0,0 +1,219 @@ + 'filter', 'node' => 'node', 'system' => 'system', 'user' => 'user', 'watchdog' => 'watchdog'); + if ($bootstrap) { + $result = db_query("SELECT name, filename, throttle, bootstrap FROM {system} WHERE type = 'module' AND status = 1 AND bootstrap = 1 ORDER BY weight ASC, filename ASC"); + } + else { + $result = db_query("SELECT name, filename, throttle, bootstrap FROM {system} WHERE type = 'module' AND status = 1 ORDER BY weight ASC, filename ASC"); + } + while ($module = db_fetch_object($result)) { + if (file_exists($module->filename)) { + // Determine the current throttle status and see if the module should be + // loaded based on server load. We have to directly access the throttle + // variables, since throttle.module may not be loaded yet. + $throttle = ($module->throttle && variable_get('throttle_level', 0) > 0); + if (!$throttle) { + drupal_get_filename('module', $module->name, $module->filename); + $list[$module->name] = $module->name; + } + } + } + } + if ($sort) { + if (!isset($sorted_list)) { + $sorted_list = $list; + ksort($sorted_list); + } + return $sorted_list; + } + return $list; +} + +/** + * Determine whether a given module exists. + * + * @param $module + * The name of the module (without the .module extension). + * @return + * TRUE if the module is both installed and enabled. + */ +function module_exist($module) { + $list = module_list(); + return array_key_exists($module, $list); +} + +/** + * @defgroup hooks Hooks + * @{ + * Allow modules to interact with the Drupal core. + * + * Drupal's module system is based on the concept of "hooks". A hook is a PHP + * function that is named foo_bar(), where "foo" is the name of the module (whose + * filename is thus foo.module) and "bar" is the name of the hook. Each hook has + * a defined set of parameters and a specified result type. + * + * To extend Drupal, a module need simply implement a hook. When Drupal wishes to + * allow intervention from modules, it determines which modules implement a hook + * and call that hook in all enabled modules that implement it. + * + * The available hooks to implement are explained here in the Hooks section of + * the developer documentation. The string "hook" is used as a placeholder for + * the module name is the hook definitions. For example, if the module file is + * called example.module, then hook_help() as implemented by that module would be + * defined as example_help(). + */ + +/** + * Determine whether a module implements a hook. + * + * @param $module + * The name of the module (without the .module extension). + * @param $hook + * The name of the hook (e.g. "help" or "menu"). + * @return + * TRUE if the module is both installed and enabled, and the hook is + * implemented in that module. + */ +function module_hook($module, $hook) { + return function_exists($module .'_'. $hook); +} + +/** + * Determine which modules are implementing a hook. + * + * @param $hook + * The name of the hook (e.g. "help" or "menu"). + * @param $sort + * By default, modules are ordered by weight and filename, settings this option + * to TRUE, module list will be ordered by module name. + * @return + * An array with the names of the modules which are implementing this hook. + */ +function module_implements($hook, $sort = FALSE) { + static $implementations; + + if (!isset($implementations[$hook])) { + $implementations[$hook] = array(); + $list = module_list(FALSE, TRUE, $sort); + foreach ($list as $module) { + if (module_hook($module, $hook)) { + $implementations[$hook][] = $module; + } + } + } + + // The explicit cast forces a copy to be made. This is needed because + // $implementations[$hook] is only a reference to an element of + // $implementations and if there are nested foreaches (due to nested node + // API calls, for example), they would both manipulate the same array's + // references, which causes some modules' hooks not to be called. + // See also http://www.zend.com/zend/art/ref-count.php. + return (array)$implementations[$hook]; +} + +/** + * Invoke a hook in a particular module. + * + * @param $module + * The name of the module (without the .module extension). + * @param $hook + * The name of the hook to invoke. + * @param ... + * Arguments to pass to the hook implementation. + * @return + * The return value of the hook implementation. + */ +function module_invoke() { + $args = func_get_args(); + $module = array_shift($args); + $hook = array_shift($args); + $function = $module .'_'. $hook; + if (module_hook($module, $hook)) { + return call_user_func_array($function, $args); + } +} +/** + * Invoke a hook in all enabled modules that implement it. + * + * @param $hook + * The name of the hook to invoke. + * @param ... + * Arguments to pass to the hook. + * @return + * An array of return values of the hook implementations. If modules return + * arrays from their implementations, those are merged into one array. + */ +function module_invoke_all() { + $args = func_get_args(); + $hook = array_shift($args); + $return = array(); + foreach (module_implements($hook) as $module) { + $function = $module .'_'. $hook; + $result = call_user_func_array($function, $args); + if (isset($result) && is_array($result)) { + $return = array_merge($return, $result); + } + else if (isset($result)) { + $return[] = $result; + } + } + + return $return; +} + +/** + * @} End of "defgroup hooks". + */ + + diff --git a/includes/pager.inc b/includes/pager.inc new file mode 100644 index 0000000..cff8da8 --- /dev/null +++ b/includes/pager.inc @@ -0,0 +1,430 @@ + 1) { + $output .= '
      '; + $output .= theme('pager_first', ($tags[0] ? $tags[0] : t('« first')), $limit, $element, $parameters); + $output .= theme('pager_previous', ($tags[1] ? $tags[1] : t('‹ previous')), $limit, $element, 1, $parameters); + $output .= theme('pager_list', $limit, $element, ($tags[2] ? $tags[2] : 9 ), '', $parameters); + $output .= theme('pager_next', ($tags[3] ? $tags[3] : t('next ›')), $limit, $element, 1, $parameters); + $output .= theme('pager_last', ($tags[4] ? $tags[4] : t('last »')), $limit, $element, $parameters); + $output .= '
      '; + + return $output; + } +} + +/** + * @name Pager pieces + * @{ + * Use these pieces to construct your own custom pagers in your theme. Note that + * you should NOT modify this file to customize your pager. + */ + +/** + * Format a "first page" link. + * + * @param $text + * The name (or image) of the link. + * @param $limit + * The number of query results to display per page. + * @param $element + * An optional integer to distinguish between multiple pagers on one page. + * @param $parameters + * An associative array of query string parameters to append to the pager links. + * @return + * An HTML string that generates this piece of the query pager. + * + * @ingroup themeable + */ +function theme_pager_first($text, $limit, $element = 0, $parameters = array()) { + global $pager_page_array; + $output = ''; + + // If we are anywhere but the first page + if ($pager_page_array[$element] > 0) { + $output = theme('pager_link', $text, pager_load_array(0, $element, $pager_page_array), $element, $parameters, array('class' => 'pager-first')); + } + + return $output; +} + +/** + * Format a "previous page" link. + * + * @param $text + * The name (or image) of the link. + * @param $limit + * The number of query results to display per page. + * @param $element + * An optional integer to distinguish between multiple pagers on one page. + * @param $interval + * The number of pages to move backward when the link is clicked. + * @param $parameters + * An associative array of query string parameters to append to the pager links. + * @return + * An HTML string that generates this piece of the query pager. + * + * @ingroup themeable + */ +function theme_pager_previous($text, $limit, $element = 0, $interval = 1, $parameters = array()) { + global $pager_page_array; + $output = ''; + + // If we are anywhere but the first page + if ($pager_page_array[$element] > 0) { + $page_new = pager_load_array($pager_page_array[$element] - $interval, $element, $pager_page_array); + + // If the previous page is the first page, mark the link as such. + if ($page_new[$element] == 0) { + $output = theme('pager_first', $text, $limit, $element, $parameters); + } + // The previous page is not the first page. + else { + $output = theme('pager_link', $text, $page_new, $element, $parameters, array('class' => 'pager-previous')); + } + } + + return $output; +} + +/** + * Format a "next page" link. + * + * @param $text + * The name (or image) of the link. + * @param $limit + * The number of query results to display per page. + * @param $element + * An optional integer to distinguish between multiple pagers on one page. + * @param $interval + * The number of pages to move forward when the link is clicked. + * @param $parameters + * An associative array of query string parameters to append to the pager links. + * @return + * An HTML string that generates this piece of the query pager. + * + * @ingroup themeable + */ +function theme_pager_next($text, $limit, $element = 0, $interval = 1, $parameters = array()) { + global $pager_page_array, $pager_total; + $output = ''; + + // If we are anywhere but the last page + if ($pager_page_array[$element] < ($pager_total[$element] - 1)) { + $page_new = pager_load_array($pager_page_array[$element] + $interval, $element, $pager_page_array); + // If the next page is the last page, mark the link as such. + if ($page_new[$element] == ($pager_total[$element] - 1)) { + $output = theme('pager_last', $text, $limit, $element, $parameters); + } + // The next page is not the last page. + else { + $output = theme('pager_link', $text, $page_new, $element, $parameters, array('class' => 'pager-next')); + } + } + + return $output; +} + +/** + * Format a "last page" link. + * + * @param $text + * The name (or image) of the link. + * @param $limit + * The number of query results to display per page. + * @param $element + * An optional integer to distinguish between multiple pagers on one page. + * @param $parameters + * An associative array of query string parameters to append to the pager links. + * @return + * An HTML string that generates this piece of the query pager. + * + * @ingroup themeable + */ +function theme_pager_last($text, $limit, $element = 0, $parameters = array()) { + global $pager_page_array, $pager_total; + $output = ''; + + // If we are anywhere but the last page + if ($pager_page_array[$element] < ($pager_total[$element] - 1)) { + $output = theme('pager_link', $text, pager_load_array($pager_total[$element] - 1, $element, $pager_page_array), $element, $parameters, array('class' => 'pager-last')); + } + + return $output; +} + +/** + * Format a list of nearby pages with additional query results. + * + * @param $limit + * The number of query results to display per page. + * @param $element + * An optional integer to distinguish between multiple pagers on one page. + * @param $quantity + * The number of pages in the list. + * @param $text + * A string of text to display before the page list. + * @param $parameters + * An associative array of query string parameters to append to the pager links. + * @return + * An HTML string that generates this piece of the query pager. + * + * @ingroup themeable + */ +function theme_pager_list($limit, $element = 0, $quantity = 5, $text = '', $parameters = array()) { + global $pager_page_array, $pager_total; + + $output = ''; + // Calculate various markers within this pager piece: + // Middle is used to "center" pages around the current page. + $pager_middle = ceil($quantity / 2); + // current is the page we are currently paged to + $pager_current = $pager_page_array[$element] + 1; + // first is the first page listed by this pager piece (re quantity) + $pager_first = $pager_current - $pager_middle + 1; + // last is the last page listed by this pager piece (re quantity) + $pager_last = $pager_current + $quantity - $pager_middle; + // max is the maximum page number + $pager_max = $pager_total[$element]; + // End of marker calculations. + + // Prepare for generation loop. + $i = $pager_first; + if ($pager_last > $pager_max) { + // Adjust "center" if at end of query. + $i = $i + ($pager_max - $pager_last); + $pager_last = $pager_max; + } + if ($i <= 0) { + // Adjust "center" if at start of query. + $pager_last = $pager_last + (1 - $i); + $i = 1; + } + // End of generation loop preparation. + + // When there is more than one page, create the pager list. + if ($i != $pager_max) { + $output .= $text; + if ($i > 1) { + $output .= '…'; + } + + // Now generate the actual pager piece. + for (; $i <= $pager_last && $i <= $pager_max; $i++) { + if ($i < $pager_current) { + $output .= theme('pager_previous', $i, $limit, $element, ($pager_current - $i), $parameters); + } + if ($i == $pager_current) { + $output .= ''. $i .''; + } + if ($i > $pager_current) { + $output .= theme('pager_next', $i, $limit, $element, ($i - $pager_current), $parameters); + } + } + + if ($i < $pager_max) { + $output .= '…'; + } + } + $output .= ''; + + return $output; +} + +/** + * Format a link to a specific query result page. + * + * @param $page_new + * The first result to display on the linked page. + * @param $element + * An optional integer to distinguish between multiple pagers on one page. + * @param $parameters + * An associative array of query string parameters to append to the pager link. + * @param $attributes + * An associative array of HTML attributes to apply to a pager anchor tag. + * @return + * An HTML string that generates the link. + */ +function theme_pager_link($text, $page_new, $element, $parameters = array(), $attributes = array()) { + $page = isset($_GET['page']) ? $_GET['page'] : ''; + if ($new_page = implode(',', pager_load_array($page_new[$element], $element, explode(',', $page)))) { + $parameters['page'] = $new_page; + } + + $query = array(); + if (count($parameters)) { + $query[] = drupal_query_string_encode($parameters, array()); + } + $querystring = pager_get_querystring(); + if ($querystring != '') { + $query[] = $querystring; + } + + // Set each pager link title + if (!isset($attributes['title'])) { + static $titles = null; + if (!isset($titles)) { + $titles = array( + t('« first') => t('Go to first page'), + t('‹ previous') => t('Go to previous page'), + t('next ›') => t('Go to next page'), + t('last »') => t('Go to last page'), + ); + } + if (isset($titles[$text])) { + $attributes['title'] = $titles[$text]; + } + else if (is_numeric($text)) { + $attributes['title'] = t('Go to page %number', array('%number' => $text)); + } + } + + return l($text, $_GET['q'], $attributes, count($query) ? implode('&', $query) : NULL); +} + +/** + * @} End of "Pager pieces". + */ + +/** + * Helper function + * + * Copies $old_array to $new_array and sets $new_array[$element] = $value + * Fills in $new_array[0 .. $element - 1] = 0 + */ +function pager_load_array($value, $element, $old_array) { + $new_array = $old_array; + // Look for empty elements. + for ($i = 0; $i < $element; $i++) { + if (!$new_array[$i]) { + // Load found empty element with 0. + $new_array[$i] = 0; + } + } + // Update the changed element. + $new_array[$element] = (int)$value; + return $new_array; +} + + diff --git a/includes/path.inc b/includes/path.inc new file mode 100644 index 0000000..e5476a2 --- /dev/null +++ b/includes/path.inc @@ -0,0 +1,201 @@ + 0 && $path != '') { + if ($action == 'alias') { + if (isset($map[$path])) { + return $map[$path]; + } + if ($alias = db_result(db_query("SELECT dst FROM {url_alias} WHERE src = '%s'", $path))) { + $map[$path] = $alias; + return $alias; + } + else { + $map[$path] = $path; + } + } + elseif ($action == 'source') { + if ($alias = array_search($path, $map)) { + return $alias; + } + if (!isset($map[$path])) { + if ($src = db_result(db_query("SELECT src FROM {url_alias} WHERE dst = '%s'", $path))) { + $map[$src] = $path; + return $src; + } + } + } + } + + return FALSE; +} + +/** + * Given an internal Drupal path, return the alias set by the administrator. + * + * @param $path + * An internal Drupal path. + * + * @return + * An aliased path if one was found, or the original path if no alias was + * found. + */ +function drupal_get_path_alias($path) { + $result = $path; + if ($alias = drupal_lookup_path('alias', $path)) { + $result = $alias; + } + if (function_exists('custom_url_rewrite')) { + $result = custom_url_rewrite('alias', $result, $path); + } + return $result; +} + +/** + * Given a path alias, return the internal path it represents. + * + * @param $path + * A Drupal path alias. + * + * @return + * The internal path represented by the alias, or the original alias if no + * internal path was found. + */ +function drupal_get_normal_path($path) { + $result = $path; + if ($src = drupal_lookup_path('source', $path)) { + $result = $src; + } + if (function_exists('custom_url_rewrite')) { + $result = custom_url_rewrite('source', $result, $path); + } + return $result; +} + +/** + * Return a component of the current Drupal path. + * + * When viewing a page at the path "admin/node/configure", for example, arg(0) + * would return "admin", arg(1) would return "node", and arg(2) would return + * "configure". + * + * Avoid use of this function where possible, as resulting code is hard to read. + * Instead, attempt to use named arguments in menu callback functions. See the + * explanation in menu.inc for how to construct callbacks that take arguments. + * + * @param $index + * The index of the component, where each component is separated by a '/' + * (forward-slash), and where the first component has an index of 0 (zero). + * + * @return + * The component specified by $index, or FALSE if the specified component was + * not found. + */ +function arg($index) { + static $arguments, $q; + + if (empty($arguments) || $q != $_GET['q']) { + $arguments = explode('/', $_GET['q']); + $q = $_GET['q']; + } + + if (isset($arguments[$index])) { + return $arguments[$index]; + } +} + +/** + * Get the title of the current page, for display on the page and in the title bar. + * + * @return + * The current page's title. + */ +function drupal_get_title() { + $title = drupal_set_title(); + + // during a bootstrap, menu.inc is not included and thus we cannot provide a title + if (!isset($title) && function_exists('menu_get_active_title')) { + $title = check_plain(menu_get_active_title()); + } + + return $title; +} + +/** + * Set the title of the current page, for display on the page and in the title bar. + * + * @param $title + * Optional string value to assign to the page title; or if set to NULL + * (default), leaves the current title unchanged. + * + * @return + * The updated title of the current page. + */ +function drupal_set_title($title = NULL) { + static $stored_title; + + if (isset($title)) { + $stored_title = $title; + } + return $stored_title; +} + +/** + * Check if the current page is the front page. + * + * @return + * Boolean value: TRUE if the current page is the front page; FALSE if otherwise. + */ +function drupal_is_front_page() { + // As drupal_init_path updates $_GET['q'] with the 'site_frontpage' path, + // we can check it against the 'site_frontpage' variable. + return $_GET['q'] == variable_get('site_frontpage', 'node'); +} diff --git a/includes/session.inc b/includes/session.inc new file mode 100644 index 0000000..e251d5b --- /dev/null +++ b/includes/session.inc @@ -0,0 +1,91 @@ +roles = array(); + if ($user->uid) { + $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; + + $result = db_query("SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d", $user->uid); + while ($role = db_fetch_object($result)) { + $user->roles[$role->rid] = $role->name; + } + } + else { + $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user'; + } + + return !empty($user->session) ? $user->session : ''; +} + +function sess_write($key, $value) { + global $user; + + $result = db_query("SELECT sid FROM {sessions} WHERE sid = '%s'", $key); + + if (!db_num_rows($result)) { + // Only save session data when when the browser sends a cookie. This keeps + // crawlers out of session table. This improves speed up queries, reduces + // memory, and gives more useful statistics. We can't eliminate anonymous + // session table rows without breaking throttle module and "Who's Online" + // block. + if ($user->uid || $value || count($_COOKIE)) { + db_query("INSERT INTO {sessions} (sid, uid, cache, hostname, session, timestamp) VALUES ('%s', %d, %d, '%s', '%s', %d)", $key, $user->uid, $user->cache, $_SERVER["REMOTE_ADDR"], $value, time()); + } + } + else { + db_query("UPDATE {sessions} SET uid = %d, cache = %d, hostname = '%s', session = '%s', timestamp = %d WHERE sid = '%s'", $user->uid, $user->cache, $_SERVER["REMOTE_ADDR"], $value, time(), $key); + + // TODO: this can be an expensive query. Perhaps only execute it every x minutes. Requires investigation into cache expiration. + if ($user->uid) { + db_query("UPDATE {users} SET access = %d WHERE uid = %d", time(), $user->uid); + } + } + + return TRUE; +} + +function sess_destroy($key) { + db_query("DELETE FROM {sessions} WHERE sid = '%s'", $key); +} + +function sess_gc($lifetime) { + // Be sure to adjust 'php_value session.gc_maxlifetime' to a large enough + // value. For example, if you want user sessions to stay in your database + // for three weeks before deleting them, you need to set gc_maxlifetime + // to '1814400'. At that value, only after a user doesn't log in after + // three weeks (1814400 seconds) will his/her session be removed. + db_query("DELETE FROM {sessions} WHERE timestamp < %d", time() - $lifetime); + + return TRUE; +} + diff --git a/includes/tablesort.inc b/includes/tablesort.inc new file mode 100644 index 0000000..2e0c010 --- /dev/null +++ b/includes/tablesort.inc @@ -0,0 +1,189 @@ + $cell['data'])); + if ($cell['data'] == $ts['name']) { + $ts['sort'] = (($ts['sort'] == 'asc') ? 'desc' : 'asc'); + $cell['class'] = 'active'; + $image = theme('tablesort_indicator', $ts['sort']); + } + else { + // If the user clicks a different header, we want to sort ascending initially. + $ts['sort'] = 'asc'; + $image = ''; + } + + if (!empty($ts['query_string'])) { + $ts['query_string'] = '&'. $ts['query_string']; + } + $cell['data'] = l($cell['data'] . $image, $_GET['q'], array('title' => $title), 'sort='. $ts['sort'] .'&order='. urlencode($cell['data']) . $ts['query_string'], NULL, FALSE, TRUE); + + unset($cell['field'], $cell['sort']); + } + return $cell; +} + +/** + * Format a table cell. + * + * Adds a class attribute to all cells in the currently active column. + * + * @param $cell + * The cell to format. + * @param $header + * An array of column headers in the format described in theme_table(). + * @param $ts + * The current table sort context as returned from tablesort_init(). + * @param $i + * The index of the cell's table column. + * @return + * A properly formatted cell, ready for _theme_table_cell(). + */ +function tablesort_cell($cell, $header, $ts, $i) { + if (isset($header[$i]) && $header[$i]['data'] == $ts['name'] && $header[$i]['field']) { + if (is_array($cell)) { + if (isset($cell['class'])) { + $cell['class'] .= ' active'; + } + else { + $cell['class'] = 'active'; + } + } + else { + $cell = array('data' => $cell, 'class' => 'active'); + } + } + return $cell; +} + +/** + * Compose a query string to append to table sorting requests. + * + * @return + * A query string that consists of all components of the current page request + * except for those pertaining to table sorting. + */ +function tablesort_get_querystring() { + return drupal_query_string_encode($_REQUEST, array_merge(array('q', 'sort', 'order'), array_keys($_COOKIE))); +} + +/** + * Determine the current sort criterion. + * + * @param $headers + * An array of column headers in the format described in theme_table(). + * @return + * An associative array describing the criterion, containing the keys: + * - "name": The localized title of the table column. + * - "sql": The name of the database field to sort on. + */ +function tablesort_get_order($headers) { + $order = isset($_GET['order']) ? $_GET['order'] : ''; + foreach ($headers as $header) { + if (isset($header['data']) && $order == $header['data']) { + return array('name' => $header['data'], 'sql' => $header['field']); + } + + if (isset($header['sort']) && ($header['sort'] == 'asc' || $header['sort'] == 'desc')) { + $default = array('name' => $header['data'], 'sql' => $header['field']); + } + } + + if (isset($default)) { + return $default; + } + else { + // The first column specified is initial 'order by' field unless otherwise specified + if (is_array($headers[0])) { + return array('name' => $headers[0]['data'], 'sql' => $headers[0]['field']); + } + else { + return array('name' => $headers[0]); + } + } +} + +/** + * Determine the current sort direction. + * + * @param $headers + * An array of column headers in the format described in theme_table(). + * @return + * The current sort direction ("asc" or "desc"). + */ +function tablesort_get_sort($headers) { + if (isset($_GET['sort'])) { + return ($_GET['sort'] == 'desc') ? 'desc' : 'asc'; + } + // User has not specified a sort. Use default if specified; otherwise use "asc". + else { + foreach ($headers as $header) { + if (is_array($header) && array_key_exists('sort', $header)) { + return $header['sort']; + } + } + } + return 'asc'; +} diff --git a/includes/theme.inc b/includes/theme.inc new file mode 100644 index 0000000..b71d040 --- /dev/null +++ b/includes/theme.inc @@ -0,0 +1,1034 @@ +Theme system + * @see themeable + */ + + /** + * @name Content markers + * @{ + * Markers used by theme_mark() and node_mark() to designate content. + * @see theme_mark(), node_mark() + */ +define('MARK_READ', 0); +define('MARK_NEW', 1); +define('MARK_UPDATED', 2); +/** + * @} End of "Content markers". + */ + +/** + * Initialize the theme system by loading the theme. + * + */ +function init_theme() { + global $theme, $user, $custom_theme, $theme_engine, $theme_key; + + // If $theme is already set, assume the others are set, too, and do nothing + if (isset($theme)) { + return; + } + + drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE); + $themes = list_themes(); + + // Only select the user selected theme if it is available in the + // list of enabled themes. + $theme = $user->theme && $themes[$user->theme]->status ? $user->theme : variable_get('theme_default', 'bluemarine'); + + // Allow modules to override the present theme... only select custom theme + // if it is available in the list of installed themes. + $theme = $custom_theme && $themes[$custom_theme] ? $custom_theme : $theme; + + // Store the identifier for retrieving theme settings with. + $theme_key = $theme; + + // If we're using a style, load its appropriate theme, + // which is stored in the style's description field. + // Also load the stylesheet using theme_add_style(). + // Otherwise, load the theme. + if (strpos($themes[$theme]->filename, '.css')) { + // File is a style; loads its CSS. + // Set theme to its template/theme + theme_add_style($themes[$theme]->filename); + $theme = basename(dirname($themes[$theme]->description)); + } + else { + // File is a template/theme + // Load its CSS, if it exists + if (file_exists($stylesheet = dirname($themes[$theme]->filename) .'/style.css')) { + theme_add_style($stylesheet); + } + } + + if (strpos($themes[$theme]->filename, '.theme')) { + // file is a theme; include it + include_once './' . $themes[$theme]->filename; + } + elseif (strpos($themes[$theme]->description, '.engine')) { + // file is a template; include its engine + include_once './' . $themes[$theme]->description; + $theme_engine = basename($themes[$theme]->description, '.engine'); + if (function_exists($theme_engine .'_init')) { + call_user_func($theme_engine .'_init', $themes[$theme]); + } + } +} + +/** + * Provides a list of currently available themes. + * + * @param $refresh + * Whether to reload the list of themes from the database. + * @return + * An array of the currently available themes. + */ +function list_themes($refresh = FALSE) { + static $list; + + if ($refresh) { + unset($list); + } + + if (!$list) { + $list = array(); + $result = db_query("SELECT * FROM {system} WHERE type = 'theme'"); + while ($theme = db_fetch_object($result)) { + if (file_exists($theme->filename)) { + $list[$theme->name] = $theme; + } + } + } + + return $list; +} + +/** + * Provides a list of currently available theme engines + * + * @param $refresh + * Whether to reload the list of themes from the database. + * @return + * An array of the currently available theme engines. + */ +function list_theme_engines($refresh = FALSE) { + static $list; + + if ($refresh) { + unset($list); + } + + if (!$list) { + $list = array(); + $result = db_query("SELECT * FROM {system} WHERE type = 'theme_engine' AND status = '1' ORDER BY name"); + while ($engine = db_fetch_object($result)) { + if (file_exists($engine->filename)) { + $list[$engine->name] = $engine; + } + } + } + + return $list; +} + +/** + * Generate the themed representation of a Drupal object. + * + * All requests for themed functions must go through this function. It examines + * the request and routes it to the appropriate theme function. If the current + * theme does not implement the requested function, then the current theme + * engine is checked. If neither the engine nor theme implement the requested + * function, then the base theme function is called. + * + * For example, to retrieve the HTML that is output by theme_page($output), a + * module should call theme('page', $output). + * + * @param $function + * The name of the theme function to call. + * @param ... + * Additional arguments to pass along to the theme function. + * @return + * An HTML string that generates the themed output. + */ +function theme() { + $args = func_get_args(); + $function = array_shift($args); + + if ($func = theme_get_function($function)) { + return call_user_func_array($func, $args); + } +} + +/** + * Determine if a theme function exists, and if so return which one was found. + * + * @param $function + * The name of the theme function to test. + * @return + * The name of the theme function that should be used, or false if no function exists. + */ +function theme_get_function($function) { + global $theme, $theme_engine; + + // Because theme() is called a lot, calling init_theme() only to have it + // smartly return is a noticeable performance hit. Don't do it. + if (!isset($theme)) { + init_theme(); + } + + if (($theme != '') && function_exists($theme .'_'. $function)) { + // call theme function + return $theme .'_'. $function; + } + elseif (($theme != '') && isset($theme_engine) && function_exists($theme_engine .'_'. $function)) { + // call engine function + return $theme_engine .'_'. $function; + } + elseif (function_exists('theme_'. $function)){ + // call Drupal function + return 'theme_'. $function; + } + return false; +} + +/** + * Return the path to the currently selected theme. + */ +function path_to_theme() { + global $theme; + + $themes = list_themes(); + + return dirname($themes[$theme]->filename); +} + +/** + * Retrieve an associative array containing the settings for a theme. + * + * The final settings are arrived at by merging the default settings, + * the site-wide settings, and the settings defined for the specific theme. + * If no $key was specified, only the site-wide theme defaults are retrieved. + * + * The default values for each of settings are also defined in this function. + * To add new settings, add their default values here, and then add form elements + * to system_theme_settings() in system.module. + * + * @param $key + * The template/style value for a given theme. + * + * @return + * An associative array containing theme settings. + */ +function theme_get_settings($key = NULL) { + $defaults = array( + 'mission' => '', + 'default_logo' => 1, + 'logo_path' => '', + 'default_favicon' => 1, + 'favicon_path' => '', + 'toggle_logo' => 1, + 'toggle_favicon' => 1, + 'toggle_name' => 1, + 'toggle_search' => 1, + 'toggle_slogan' => 0, + 'toggle_mission' => 1, + 'toggle_node_user_picture' => 0, + 'toggle_comment_user_picture' => 0, + ); + + if (module_exist('node')) { + foreach (node_get_types() as $type => $name) { + $defaults['toggle_node_info_' . $type] = 1; + } + } + $settings = array_merge($defaults, variable_get('theme_settings', array())); + + if ($key) { + $settings = array_merge($settings, variable_get(str_replace('/', '_', 'theme_'. $key .'_settings'), array())); + } + + // Only offer search box if search.module is enabled. + if (!module_exist('search') || !user_access('search content')) { + $settings['toggle_search'] = 0; + } + + return $settings; +} + +/** + * Retrieve a setting for the current theme. + * This function is designed for use from within themes & engines + * to determine theme settings made in the admin interface. + * + * Caches values for speed (use $refresh = TRUE to refresh cache) + * + * @param $setting_name + * The name of the setting to be retrieved. + * + * @param $refresh + * Whether to reload the cache of settings. + * + * @return + * The value of the requested setting, NULL if the setting does not exist. + */ +function theme_get_setting($setting_name, $refresh = FALSE) { + global $theme_key; + static $settings; + + if (empty($settings) || $refresh) { + $settings = theme_get_settings($theme_key); + + $themes = list_themes(); + $theme_object = $themes[$theme_key]; + + if ($settings['mission'] == '') { + $settings['mission'] = variable_get('site_mission', ''); + } + + if (!$settings['toggle_mission']) { + $settings['mission'] = ''; + } + + if ($settings['toggle_logo']) { + if ($settings['default_logo']) { + $settings['logo'] = base_path() . dirname($theme_object->filename) .'/logo.png'; + } + elseif ($settings['logo_path']) { + $settings['logo'] = base_path() . $settings['logo_path']; + } + } + + if ($settings['toggle_favicon']) { + if ($settings['default_favicon']) { + if (file_exists($favicon = dirname($theme_object->filename) .'/favicon.ico')) { + $settings['favicon'] = base_path() . $favicon; + } + else { + $settings['favicon'] = base_path() . 'misc/favicon.ico'; + } + } + elseif ($settings['favicon_path']) { + $settings['favicon'] = base_path() . $settings['favicon_path']; + } + } + } + + return isset($settings[$setting_name]) ? $settings[$setting_name] : NULL; +} + +/** + * Add a theme stylesheet to be included later. This is handled separately from + * drupal_set_html_head() to enforce the correct CSS cascading order. + */ +function theme_add_style($path = '', $media = 'all') { + static $styles = array(); + + if ($path && !isset($styles["$media:$path"])) { + $style = new stdClass(); + $style->path = base_path() . $path; + $style->media = $media; + $styles["$media:$path"] = $style; + } + return $styles; +} + +/** + * Return the HTML for a theme's stylesheets. + */ +function theme_get_styles() { + $output = ''; + foreach (theme_add_style() as $style) { + $output .= theme('stylesheet_import', $style->path, $style->media); + } + return $output; +} + +/** + * @defgroup themeable Themeable functions + * @{ + * Functions that display HTML, and which can be customized by themes. + * + * All functions that produce HTML for display should be themeable. This means + * that they should be named with the theme_ prefix, and invoked using theme() + * rather than being called directly. This allows themes to override the display + * of any Drupal object. + * + * The theme system is described and defined in theme.inc. + */ + +/** + * Format a dynamic text string for emphasized display in a placeholder. + * + * E.g. t('Added term %term', array('%term' => theme('placeholder', $term))) + * + * @param $text + * The text to format (plain-text). + * @return + * The formatted text (html). + */ +function theme_placeholder($text) { + return ''. check_plain($text) .''; +} + +/** + * Return an entire Drupal page displaying the supplied content. + * + * @param $content + * A string to display in the main content area of the page. + * @return + * A string containing the entire HTML page. + */ +function theme_page($content) { + $output = "\n"; + $output .= ''; + $output .= ''; + $output .= ' '. (drupal_get_title() ? strip_tags(drupal_get_title()) : variable_get('site_name', 'drupal')) .''; + $output .= drupal_get_html_head(); + $output .= theme_get_styles(); + + $output .= ' '; + $output .= ' '; + $output .= '
      '; + + $output .= theme('blocks', 'all'); + $output .= ''; + + $output .= theme('breadcrumb', drupal_get_breadcrumb()); + $output .= '

      ' . drupal_get_title() . '

      '; + + if ($tabs = theme('menu_local_tasks')) { + $output .= $tabs; + } + + $output .= theme('help'); + + $output .= theme('status_messages'); + + $output .= "\n\n"; + $output .= $content; + $output .= "\n\n"; + + $output .= '
      '; + $output .= theme_closure(); + $output .= ''; + + return $output; +} + +function theme_maintenance_page($content, $messages = TRUE, $partial = FALSE) { + drupal_set_header('Content-Type: text/html; charset=utf-8'); + theme('add_style', 'misc/maintenance.css'); + drupal_set_html_head(''); + + $output = "\n"; + $output .= ''; + $output .= ''; + $output .= ' '. drupal_get_title() .''; + $output .= drupal_get_html_head(); + $output .= theme_get_styles(); + $output .= ''; + $output .= ''; + $output .= '

      ' . drupal_get_title() . '

      '; + + if ($messages) { + $output .= theme('status_messages'); + } + + $output .= "\n\n"; + $output .= $content; + $output .= "\n\n"; + + if (!$partial) { + $output .= ''; + } + + return $output; +} + +/** + * Returns themed set of status and/or error messages. The messages are grouped + * by type. + * + * @return + * A string containing the messages. + */ +function theme_status_messages() { + if ($data = drupal_get_messages()) { + $output = ''; + foreach ($data as $type => $messages) { + $output .= "
      \n"; + if (count($messages) > 1) { + $output .= "
        \n"; + foreach($messages as $message) { + $output .= '
      • '. $message ."
        • \n"; + } + $output .= "
      \n"; + } + else { + $output .= $messages[0]; + } + $output .= "
      \n"; + } + + return $output; + } +} + +/** + * Return a themed set of links. + * + * @param $links + * An array of links to be themed. + * @param $delimiter + * A string used to separate the links. + * @return + * A string containing the themed links. + */ +function theme_links($links, $delimiter = ' | ') { + if (!is_array($links)) { + return ''; + } + return implode($delimiter, $links); +} + +/** + * Return a themed image. + * + * @param $path + * The path of the image file. + * @param $alt + * The alternative text for text-based browsers. + * @param $title + * The title text is displayed when the image is hovered in some popular browsers. + * @param $attributes + * Associative array of attributes to be placed in the img tag. + * @param $getsize + * If set to true, the image's dimension are fetched and added as width/height attributes. + * @return + * A string containing the image tag. + */ +function theme_image($path, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) { + if (!$getsize || (is_file($path) && (list($width, $height, $type, $image_attributes) = @getimagesize($path)))) { + $attributes = drupal_attributes($attributes); + return ''. check_plain($alt) .''; + } +} + +/** + * Return a themed breadcrumb trail. + * + * @param $breadcrumb + * An array containing the breadcrumb links. + * @return a string containing the breadcrumb output. + */ +function theme_breadcrumb($breadcrumb) { + if (!empty($breadcrumb)) { + return '
      '. implode(' » ', $breadcrumb) .'
      '; + } +} + +/** + * Return a themed help message. + * + * @return a string containing the helptext for the current page. + */ +function theme_help() { + if ($help = menu_get_active_help()) { + return '
      '. $help .'
      '; + } +} + +/** + * Return a themed node. + * + * @param $node + * An object providing all relevant information for displaying a node: + * - $node->nid: The ID of the node. + * - $node->type: The content type (story, blog, forum...). + * - $node->title: The title of the node. + * - $node->created: The creation date, as a UNIX timestamp. + * - $node->teaser: A shortened version of the node body. + * - $node->body: The entire node contents. + * - $node->changed: The last modification date, as a UNIX timestamp. + * - $node->uid: The ID of the author. + * - $node->username: The username of the author. + * @param $teaser + * Whether to display the teaser only, as on the main page. + * @param $page + * Whether to display the node as a standalone page. If TRUE, do not display + * the title because it will be provided by the menu system. + * @return + * A string containing the node output. + */ +function theme_node($node, $teaser = FALSE, $page = FALSE) { + if (!$node->status) { + $output = '
      '; + } + + if (module_exist('taxonomy')) { + $terms = taxonomy_link('taxonomy terms', $node); + } + + if ($page == 0) { + $output .= t('%title by %name', array('%title' => '

      '. check_plain($node->title) .'

      ', '%name' => theme('username', $node))); + } + else { + $output .= t('by %name', array('%name' => theme('username', $node))); + } + + if (count($terms)) { + $output .= ' ('. theme('links', $terms) .')
      '; + } + + if ($teaser && $node->teaser) { + $output .= $node->teaser; + } + else { + $output .= $node->body; + } + + if ($node->links) { + $output .= '
      '. theme('links', $node->links) .'
      '; + } + + if (!$node->status) { + $output .= '
      '; + } + + return $output; +} + +/** + * Return a themed form element. + * + * @param $title the form element's title + * @param $value the form element's data + * @param $description the form element's description or explanation + * @param $id the form element's ID used by the <label> tag + * @param $required a boolean to indicate whether this is a required field or not + * @param $error a string with an error message filed against this form element + * + * @return a string representing the form element + */ +function theme_form_element($title, $value, $description = NULL, $id = NULL, $required = FALSE, $error = FALSE) { + + $output = '
      '."\n"; + $required = $required ? '*' : ''; + + if ($title) { + if ($id) { + $output .= ' \n"; + } + else { + $output .= ' \n"; + } + } + + $output .= " $value\n"; + + if ($description) { + $output .= '
      '. $description ."
      \n"; + } + + $output .= "
      \n"; + + return $output; +} + +/** + * Return a themed submenu, typically displayed under the tabs. + * + * @param $links + * An array of links. + */ +function theme_submenu($links) { + return '
      '. implode(' | ', $links) .'
      '; +} + +/** + * Return a themed table. + * + * @param $header + * An array containing the table headers. Each element of the array can be + * either a localized string or an associative array with the following keys: + * - "data": The localized title of the table column. + * - "field": The database field represented in the table column (required if + * user is to be able to sort on this column). + * - "sort": A default sort order for this column ("asc" or "desc"). + * - Any HTML attributes, such as "colspan", to apply to the column header cell. + * @param $rows + * An array of table rows. Every row is an array of cells, or an associative + * array with the following keys: + * - "data": an array of cells + * - Any HTML attributes, such as "class", to apply to the table row. + * + * Each cell can be either a string or an associative array with the following keys: + * - "data": The string to display in the table cell. + * - Any HTML attributes, such as "colspan", to apply to the table cell. + * + * Here's an example for $rows: + * @verbatim + * $rows = array( + * // Simple row + * array( + * 'Cell 1', 'Cell 2', 'Cell 3' + * ), + * // Row with attributes on the row and some of its cells. + * array( + * 'data' => array('Cell 1', array('data' => 'Cell 2', 'colspan' => 2)), 'class' => 'funky' + * ) + * ); + * @endverbatim + * + * @param $attributes + * An array of HTML attributes to apply to the table tag. + * @param $caption + * A localized string to use for the tag. + * @return + * An HTML string representing the table. + */ +function theme_table($header, $rows, $attributes = array(), $caption = NULL) { + $output = '\n"; + + if (isset($caption)) { + $output .= ''. $caption ."\n"; + } + + // Format the table header: + if (count($header)) { + $ts = tablesort_init($header); + $output .= ' '; + foreach ($header as $cell) { + $cell = tablesort_header($cell, $header, $ts); + $output .= _theme_table_cell($cell, 1); + } + $output .= " \n"; + } + + // Format the table rows: + $output .= "\n"; + if (count($rows)) { + foreach ($rows as $number => $row) { + $attributes = array(); + + // Check if we're dealing with a simple or complex row + if (isset($row['data'])) { + foreach ($row as $key => $value) { + if ($key == 'data') { + $cells = $value; + } + else { + $attributes[$key] = $value; + } + } + } + else { + $cells = $row; + } + + // Add odd/even class + $class = ($number % 2 == 1) ? 'even': 'odd'; + if (isset($attributes['class'])) { + $attributes['class'] .= ' '. $class; + } + else { + $attributes['class'] = $class; + } + + // Build row + $output .= ' '; + $i = 0; + foreach ($cells as $cell) { + $cell = tablesort_cell($cell, $header, $ts, $i++); + $output .= _theme_table_cell($cell, 0); + } + $output .= " \n"; + } + } + + $output .= "\n"; + return $output; +} + +/** + * Return a themed sort icon. + * + * @param $style + * Set to either asc or desc. This sets which icon to show. + * @return + * A themed sort icon. + */ +function theme_tablesort_indicator($style) { + if ($style == "asc"){ + return theme('image', 'misc/arrow-asc.png', t('sort icon'), t('sort ascending')); + } + else { + return theme('image', 'misc/arrow-desc.png', t('sort icon'), t('sort descending')); + } +} + +/** + * Return a themed box. + * + * @param $title + * The subject of the box. + * @param $content + * The content of the box. + * @param $region + * The region in which the box is displayed. + * @return + * A string containing the box output. + */ +function theme_box($title, $content, $region = 'main') { + $output = '

      '. $title .'

      '. $content .'
      '; + return $output; +} + +/** + * Return a themed block. + * + * You can style your blocks by defining .block (all blocks), + * .block-module (all blocks of module module), and + * \#block-module-delta (specific block of module module + * with delta delta) in your theme's CSS. + * + * @param $block + * An object populated with fields from the "blocks" database table + * ($block->module, $block->delta ...) and fields returned by + * module_block('view') ($block->subject, $block->content, ...). + * @return + * A string containing the block output. + */ +function theme_block($block) { + $output = "
      module\" id=\"block-$block->module-$block->delta\">\n"; + $output .= "

      $block->subject

      \n"; + $output .= "
      $block->content
      \n"; + $output .= "
      \n"; + return $output; +} + +/** + * Return a themed marker, useful for marking new or updated + * content. + * + * @param $type + * Number representing the marker type to display + * @see MARK_NEW, MARK_UPDATED, MARK_READ + * @return + * A string containing the marker. + */ +function theme_mark($type = MARK_NEW) { + global $user; + if ($user->uid) { + if ($type == MARK_NEW) { + return ' '. t('new') .''; + } + else if ($type == MARK_UPDATED) { + return ' '. t('updated') .''; + } + } +} + +/** + * Import a stylesheet using @import. + * + * @param $path + * The path to the stylesheet. + * + * @param $media + * The media type to specify for the stylesheet + * + * @return + * A string containing the HTML for the stylesheet import. + */ +function theme_stylesheet_import($path, $media = 'all') { + return ''; +} + +/** + * Return a themed list of items. + * + * @param $items + * An array of items to be displayed in the list. + * @param $title + * The title of the list. + * @param $type + * The type of list to return (e.g. "ul", "ol") + * @return + * A string containing the list output. + */ +function theme_item_list($items = array(), $title = NULL, $type = 'ul') { + $output = '
      '; + if (isset($title)) { + $output .= '

      '. $title .'

      '; + } + + if (!empty($items)) { + $output .= "<$type>"; + foreach ($items as $item) { + $output .= '
    • '. $item .'
      • '; + } + $output .= ""; + } + $output .= '
      '; + return $output; +} + +/** + * Returns code that emits the 'more help'-link. + */ +function theme_more_help_link($url) { + return '
      ' . t('[more help...]', array('%link' => check_url($url))) . '
      '; +} + +/** + * Return code that emits an XML icon. + */ +function theme_xml_icon($url) { + if ($image = theme('image', 'misc/xml.png', t('XML feed'), t('XML feed'))) { + return ''. $image. ''; + } +} + +/** + * Return code that emits an feed icon. + */ +function theme_feed_icon($url) { + if ($image = theme('image', 'misc/feed.png', t('Syndicate content'), t('Syndicate content'))) { + return ''. $image. ''; + } +} + +/** + * Execute hook_footer() which is run at the end of the page right before the + * close of the body tag. + * + * @param $main (optional) + * + * @return + * A string containing the results of the hook_footer() calls. + */ +function theme_closure($main = 0) { + $footer = module_invoke_all('footer', $main); + return implode("\n", $footer); +} + +/** + * Return a set of blocks available for the current user. + * + * @param $region + * Which set of blocks to retrieve. + * @return + * A string containing the themed blocks for this region. + */ +function theme_blocks($region) { + $output = ''; + + if ($list = block_list($region)) { + foreach ($list as $key => $block) { + // $key == module_delta + $output .= theme('block', $block); + } + } + + // Add any content assigned to this region through drupal_set_content() calls. + $output .= drupal_get_content($region); + + return $output; +} + +/** + * Format a username. + * + * @param $object + * The user object to format, usually returned from user_load(). + * @return + * A string containing an HTML link to the user's page if the passed object + * suggests that this is a site user. Otherwise, only the username is returned. + */ +function theme_username($object) { + + if ($object->uid && $object->name) { + // Shorten the name when it is too long or it will break many tables. + if (drupal_strlen($object->name) > 20) { + $name = drupal_substr($object->name, 0, 15) .'...'; + } + else { + $name = $object->name; + } + + if (user_access('access user profiles')) { + $output = l($name, 'user/'. $object->uid, array('title' => t('View user profile.'))); + } + else { + $output = check_plain($name); + } + } + else if ($object->name) { + // Sometimes modules display content composed by people who are + // not registered members of the site (e.g. mailing list or news + // aggregator modules). This clause enables modules to display + // the true author of the content. + if ($object->homepage) { + $output = l($object->name, $object->homepage); + } + else { + $output = check_plain($object->name); + } + + $output .= ' ('. t('not verified') .')'; + } + else { + $output = variable_get('anonymous', 'Anonymous'); + } + + return $output; +} + +function theme_progress_bar($percent, $message) { + $output = '
      '; + $output .= '
      '. $percent .'%
      '; + $output .= '
      '. $message .'
      '; + $output .= '
      '; + $output .= '
      '; + + return $output; +} + +/** + * @} End of "defgroup themeable". + */ + +function _theme_table_cell($cell, $header = 0) { + $attributes = ''; + + if (is_array($cell)) { + $data = $cell['data']; + foreach ($cell as $key => $value) { + if ($key != 'data') { + $attributes .= " $key=\"$value\""; + } + } + } + else { + $data = $cell; + } + + if ($header) { + $output = "$data"; + } + else { + $output = "$data"; + } + + return $output; +} + diff --git a/includes/unicode.inc b/includes/unicode.inc new file mode 100644 index 0000000..d520cc6 --- /dev/null +++ b/includes/unicode.inc @@ -0,0 +1,487 @@ +PHP PCRE documentation for more information.', array('%url' => 'http://www.php.net/pcre'))); + } + return UNICODE_ERROR; + } + + // Check for mbstring extension + if (!function_exists('mb_strlen')) { + return UNICODE_SINGLEBYTE; + } + + // Check mbstring configuration + if (ini_get('mbstring.func_overload') != 0) { + if ($errors) { + form_set_error('unicode', t('Multibyte string function overloading in PHP is active and must be disabled. Check the php.ini mbstring.func_overload setting. Please refer to the PHP mbstring documentation for more information.', array('%url' => 'http://www.php.net/mbstring'))); + } + return UNICODE_ERROR; + } + if (ini_get('mbstring.encoding_translation') != 0) { + if ($errors) { + form_set_error('unicode', t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini mbstring.encoding_translation setting. Please refer to the PHP mbstring documentation for more information.', array('%url' => 'http://www.php.net/mbstring'))); + } + return UNICODE_ERROR; + } + if (ini_get('mbstring.http_input') != 'pass') { + if ($errors) { + form_set_error('unicode', t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini mbstring.http_input setting. Please refer to the PHP mbstring documentation for more information.', array('%url' => 'http://www.php.net/mbstring'))); + } + return UNICODE_ERROR; + } + if (ini_get('mbstring.http_output') != 'pass') { + if ($errors) { + form_set_error('unicode', t('Multibyte string output conversion in PHP is active and must be disabled. Check the php.ini mbstring.http_output setting. Please refer to the PHP mbstring documentation for more information.', array('%url' => 'http://www.php.net/mbstring'))); + } + return UNICODE_ERROR; + } + + // Set appropriate configuration + mb_internal_encoding('utf-8'); + mb_language('uni'); + return UNICODE_MULTIBYTE; +} + +/** + * Return the required Unicode status and errors for admin/settings. + */ +function unicode_settings() { + $status = _unicode_check(true); + $options = array(UNICODE_SINGLEBYTE => t('Standard PHP: operations on Unicode strings are emulated on a best-effort basis. Install the PHP mbstring extension for improved Unicode support.', array('%url' => 'http://www.php.net/mbstring')), + UNICODE_MULTIBYTE => t('Multi-byte: operations on Unicode strings are supported through the PHP mbstring extension.', array('%url' => 'http://www.php.net/mbstring')), + UNICODE_ERROR => t('Invalid: the current configuration is incompatible with Drupal.')); + $form['settings'] = array('#type' => 'item', '#title' => t('String handling method'), '#value' => $options[$status]); + return $form; +} + +/** + * Prepare a new XML parser. + * + * This is a wrapper around xml_parser_create() which extracts the encoding from + * the XML data first and sets the output encoding to UTF-8. This function should + * be used instead of xml_parser_create(), because PHP 4's XML parser doesn't + * check the input encoding itself. "Starting from PHP 5, the input encoding is + * automatically detected, so that the encoding parameter specifies only the + * output encoding." + * + * This is also where unsupported encodings will be converted. Callers should + * take this into account: $data might have been changed after the call. + * + * @param &$data + * The XML data which will be parsed later. + * @return + * An XML parser object. + */ +function drupal_xml_parser_create(&$data) { + // Default XML encoding is UTF-8 + $encoding = 'utf-8'; + $bom = false; + + // Check for UTF-8 byte order mark (PHP5's XML parser doesn't handle it). + if (!strncmp($data, "\xEF\xBB\xBF", 3)) { + $bom = true; + $data = substr($data, 3); + } + + // Check for an encoding declaration in the XML prolog if no BOM was found. + if (!$bom && ereg('^<\?xml[^>]+encoding="([^"]+)"', $data, $match)) { + $encoding = $match[1]; + } + + // Unsupported encodings are converted here into UTF-8. + $php_supported = array('utf-8', 'iso-8859-1', 'us-ascii'); + if (!in_array(strtolower($encoding), $php_supported)) { + $out = drupal_convert_to_utf8($data, $encoding); + if ($out !== false) { + $encoding = 'utf-8'; + $data = ereg_replace('^(<\?xml[^>]+encoding)="([^"]+)"', '\\1="utf-8"', $out); + } + else { + watchdog('php', t("Could not convert XML encoding '%s' to UTF-8.", array('%s' => $encoding)), WATCHDOG_WARNING); + return 0; + } + } + + $xml_parser = xml_parser_create($encoding); + xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, 'utf-8'); + return $xml_parser; +} + +/** + * Convert data to UTF-8 + * + * Requires the iconv, GNU recode or mbstring PHP extension. + * + * @param $data + * The data to be converted. + * @param $encoding + * The encoding that the data is in + * @return + * Converted data or FALSE. + */ +function drupal_convert_to_utf8($data, $encoding) { + if (function_exists('iconv')) { + $out = @iconv($encoding, 'utf-8', $data); + } + else if (function_exists('mb_convert_encoding')) { + $out = @mb_convert_encoding($data, 'utf-8', $encoding); + } + else if (function_exists('recode_string')) { + $out = @recode_string($encoding .'..utf-8', $data); + } + else { + watchdog('php', t("Unsupported encoding '%s'. Please install iconv, GNU recode or mbstring for PHP.", array('%s' => $encoding)), WATCHDOG_ERROR); + return FALSE; + } + + return $out; +} + +/** + * Truncate a UTF-8-encoded string safely to a number of bytes. + * + * If the end position is in the middle of a UTF-8 sequence, it scans backwards + * until the beginning of the byte sequence. + * + * Use this function whenever you want to chop off a string at an unsure + * location. On the other hand, if you're sure that you're splitting on a + * character boundary (e.g. after using strpos() or similar), you can safely use + * substr() instead. + * + * @param $string + * The string to truncate. + * @param $len + * An upper limit on the returned string length. + * @param $wordsafe + * Flag to truncate at nearest space. Defaults to FALSE. + * @return + * The truncated string. + */ +function truncate_utf8($string, $len, $wordsafe = FALSE, $dots = FALSE) { + $slen = strlen($string); + if ($slen <= $len) { + return $string; + } + if ($wordsafe) { + $end = $len; + while (($string[--$len] != ' ') && ($len > 0)) {}; + if ($len == 0) { + $len = $end; + } + } + if ((ord($string[$len]) < 0x80) || (ord($string[$len]) >= 0xC0)) { + return substr($string, 0, $len) . ($dots ? ' ...' : ''); + } + while (--$len >= 0 && ord($string[$len]) >= 0x80 && ord($string[$len]) < 0xC0) {}; + return substr($string, 0, $len) . ($dots ? ' ...' : ''); +} + +/** + * Encodes MIME/HTTP header values that contain non-ASCII, UTF-8 encoded + * characters. + * + * For example, mime_header_encode('tést.txt') returns "=?UTF-8?B?dMOpc3QudHh0?=". + * + * See http://www.rfc-editor.org/rfc/rfc2047.txt for more information. + * + * Notes: + * - Only encode strings that contain non-ASCII characters. + * - We progressively cut-off a chunk with truncate_utf8(). This is to ensure + * each chunk starts and ends on a character boundary. + * - Using \n as the chunk separator may cause problems on some systems and may + * have to be changed to \r\n or \r. + */ +function mime_header_encode($string) { + if (preg_match('/[^\x20-\x7E]/', $string)) { + $chunk_size = 47; // floor((75 - strlen("=?UTF-8?B??=")) * 0.75); + $len = strlen($string); + $output = ''; + while ($len > 0) { + $chunk = truncate_utf8($string, $chunk_size); + $output .= ' =?UTF-8?B?'. base64_encode($chunk) ."?=\n"; + $c = strlen($chunk); + $string = substr($string, $c); + $len -= $c; + } + return trim($output); + } + return $string; +} + +/** + * Complement to mime_header_encode + */ +function mime_header_decode($header) { + // First step: encoded chunks followed by other encoded chunks (need to collapse whitespace) + $header = preg_replace_callback('/=\?([^?]+)\?(Q|B)\?([^?]+|\?(?!=))\?=\s+(?==\?)/', '_mime_header_decode', $header); + // Second step: remaining chunks (do not collapse whitespace) + return preg_replace_callback('/=\?([^?]+)\?(Q|B)\?([^?]+|\?(?!=))\?=/', '_mime_header_decode', $header); +} + +/** + * Helper function to mime_header_decode + */ +function _mime_header_decode($matches) { + // Regexp groups: + // 1: Character set name + // 2: Escaping method (Q or B) + // 3: Encoded data + $data = ($matches[2] == 'B') ? base64_decode($matches[3]) : str_replace('_', ' ', quoted_printable_decode($matches[3])); + if (strtolower($matches[1]) != 'utf-8') { + $data = drupal_convert_to_utf8($data, $matches[1]); + } + return $data; +} + +/** + * Decode all HTML entities (including numerical ones) to regular UTF-8 bytes. + * Double-escaped entities will only be decoded once ("&lt;" becomes "<", not "<"). + * + * @param $text + * The text to decode entities in. + * @param $exclude + * An array of characters which should not be decoded. For example, + * array('<', '&', '"'). This affects both named and numerical entities. + */ +function decode_entities($text, $exclude = array()) { + static $table; + // We store named entities in a table for quick processing. + if (!isset($table)) { + // Get all named HTML entities. + $table = array_flip(get_html_translation_table(HTML_ENTITIES)); + // PHP gives us ISO-8859-1 data, we need UTF-8. + $table = array_map('utf8_encode', $table); + // Add apostrophe (XML) + $table['''] = "'"; + } + $newtable = array_diff($table, $exclude); + + // Use a regexp to select all entities in one pass, to avoid decoding double-escaped entities twice. + return preg_replace('/&(#x?)?([A-Za-z0-9]+);/e', '_decode_entities("$1", "$2", "$0", $newtable, $exclude)', $text); +} + +/** + * Helper function for decode_entities + */ +function _decode_entities($prefix, $codepoint, $original, &$table, &$exclude) { + // Named entity + if (!$prefix) { + if (isset($table[$original])) { + return $table[$original]; + } + else { + return $original; + } + } + // Hexadecimal numerical entity + if ($prefix == '#x') { + $codepoint = base_convert($codepoint, 16, 10); + } + // Decimal numerical entity (strip leading zeros to avoid PHP octal notation) + else { + $codepoint = preg_replace('/^0+/', '', $codepoint); + } + // Encode codepoint as UTF-8 bytes + if ($codepoint < 0x80) { + $str = chr($codepoint); + } + else if ($codepoint < 0x800) { + $str = chr(0xC0 | ($codepoint >> 6)) + . chr(0x80 | ($codepoint & 0x3F)); + } + else if ($codepoint < 0x10000) { + $str = chr(0xE0 | ( $codepoint >> 12)) + . chr(0x80 | (($codepoint >> 6) & 0x3F)) + . chr(0x80 | ( $codepoint & 0x3F)); + } + else if ($codepoint < 0x200000) { + $str = chr(0xF0 | ( $codepoint >> 18)) + . chr(0x80 | (($codepoint >> 12) & 0x3F)) + . chr(0x80 | (($codepoint >> 6) & 0x3F)) + . chr(0x80 | ( $codepoint & 0x3F)); + } + // Check for excluded characters + if (in_array($str, $exclude)) { + return $original; + } + else { + return $str; + } +} + +/** + * Count the amount of characters in a UTF-8 string. This is less than or + * equal to the byte count. + */ +function drupal_strlen($text) { + global $multibyte; + if ($multibyte == UNICODE_MULTIBYTE) { + return mb_strlen($text); + } + else { + // Do not count UTF-8 continuation bytes. + return strlen(preg_replace("/[\x80-\xBF]/", '', $text)); + } +} + +/** + * Uppercase a UTF-8 string. + */ +function drupal_strtoupper($text) { + global $multibyte; + if ($multibyte == UNICODE_MULTIBYTE) { + return mb_strtoupper($text); + } + else { + // Use C-locale for ASCII-only uppercase + $text = strtoupper($text); + // Case flip Latin-1 accented letters + $text = preg_replace_callback('/\xC3[\xA0-\xB6\xB8-\xBE]/', '_unicode_caseflip', $text); + return $text; + } +} + +/** + * Lowercase a UTF-8 string. + */ +function drupal_strtolower($text) { + global $multibyte; + if ($multibyte == UNICODE_MULTIBYTE) { + return mb_strtolower($text); + } + else { + // Use C-locale for ASCII-only lowercase + $text = strtolower($text); + // Case flip Latin-1 accented letters + $text = preg_replace_callback('/\xC3[\x80-\x96\x98-\x9E]/', '_unicode_caseflip', $text); + return $text; + } +} + +/** + * Helper function for case conversion of Latin-1. + * Used for flipping U+C0-U+DE to U+E0-U+FD and back. + */ +function _unicode_caseflip($matches) { + return $matches[0][0] . chr(ord($matches[0][1]) ^ 32); +} + +/** + * Capitalize the first letter of a UTF-8 string. + */ +function drupal_ucfirst($text) { + // Note: no mbstring equivalent! + return drupal_strtoupper(drupal_substr($text, 0, 1)) . drupal_substr($text, 1); +} + +/** + * Cut off a piece of a string based on character indices and counts. Follows + * the same behaviour as PHP's own substr() function. + * + * Note that for cutting off a string at a known character/substring + * location, the usage of PHP's normal strpos/substr is safe and + * much faster. + */ +function drupal_substr($text, $start, $length = NULL) { + global $multibyte; + if ($multibyte == UNICODE_MULTIBYTE) { + return $length === NULL ? mb_substr($text, $start) : mb_substr($text, $start, $length); + } + else { + $strlen = strlen($text); + // Find the starting byte offset + if ($start > 0) { + // Count all the continuation bytes from the start until we have found + // $start characters + $bytes = -1; $chars = -1; + while ($bytes < $strlen && $chars < $start) { + $bytes++; + $c = ord($text[$bytes]); + if ($c < 0x80 || $c >= 0xC0) { + $chars++; + } + } + } + else if ($start < 0) { + // Count all the continuation bytes from the end until we have found + // abs($start) characters + $start = abs($start); + $bytes = $strlen; $chars = 0; + while ($bytes > 0 && $chars < $start) { + $bytes--; + $c = ord($text[$bytes]); + if ($c < 0x80 || $c >= 0xC0) { + $chars++; + } + } + } + $istart = $bytes; + + // Find the ending byte offset + if ($length === NULL) { + $bytes = $strlen - 1; + } + else if ($length > 0) { + // Count all the continuation bytes from the starting index until we have + // found $length + 1 characters. Then backtrack one byte. + $bytes = $istart; $chars = 0; + while ($bytes < $strlen && $chars < $length) { + $bytes++; + $c = ord($text[$bytes]); + if ($c < 0x80 || $c >= 0xC0) { + $chars++; + } + } + $bytes--; + } + else if ($length < 0) { + // Count all the continuation bytes from the end until we have found + // abs($length) characters + $length = abs($length); + $bytes = $strlen - 1; $chars = 0; + while ($bytes >= 0 && $chars < $length) { + $c = ord($text[$bytes]); + if ($c < 0x80 || $c >= 0xC0) { + $chars++; + } + $bytes--; + } + } + $iend = $bytes; + + return substr($text, $istart, max(0, $iend - $istart + 1)); + } +} + + diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc new file mode 100644 index 0000000..129dc5c --- /dev/null +++ b/includes/xmlrpc.inc @@ -0,0 +1,476 @@ +data = $data; + if (!$type) { + $type = xmlrpc_value_calculate_type($xmlrpc_value); + } + $xmlrpc_value->type = $type; + if ($type == 'struct') { + // Turn all the values in the array into new xmlrpc_values + foreach ($xmlrpc_value->data as $key => $value) { + $xmlrpc_value->data[$key] = xmlrpc_value($value); + } + } + if ($type == 'array') { + for ($i = 0, $j = count($xmlrpc_value->data); $i < $j; $i++) { + $xmlrpc_value->data[$i] = xmlrpc_value($xmlrpc_value->data[$i]); + } + } + return $xmlrpc_value; +} + +/** + * Map PHP type to XML-RPC type. + * + * @param $xmlrpc_value + * Variable whose type should be mapped. + * @return + * XML-RPC type as string. + * @see + * http://www.xmlrpc.com/spec#scalars + */ +function xmlrpc_value_calculate_type(&$xmlrpc_value) { + // http://www.php.net/gettype: Never use gettype() to test for a certain type [...] Instead, use the is_* functions. + if (is_bool($xmlrpc_value->data)) { + return 'boolean'; + } + if (is_double($xmlrpc_value->data)) { + return 'double'; + } + if (is_int($xmlrpc_value->data)) { + return 'int'; + } + if (is_array($xmlrpc_value->data)) { + // empty or integer-indexed arrays are 'array', string-indexed arrays 'struct' + return empty($xmlrpc_value->data) || range(0, count($xmlrpc_value->data) - 1) === array_keys($xmlrpc_value->data) ? 'array' : 'struct'; + } + if (is_object($xmlrpc_value->data)) { + if ($xmlrpc_value->data->is_date) { + return 'date'; + } + if ($xmlrpc_value->data->is_base64) { + return 'base64'; + } + $xmlrpc_value->data = get_object_vars($xmlrpc_value->data); + return 'struct'; + } + // default + return 'string'; +} + +/** + * Generate XML representing the given value. + * + * @param $xmlrpc_value + * @return + * XML representation of value. + */ +function xmlrpc_value_get_xml($xmlrpc_value) { + switch ($xmlrpc_value->type) { + case 'boolean': + return ''. (($xmlrpc_value->data) ? '1' : '0') .''; + break; + case 'int': + return ''. $xmlrpc_value->data .''; + break; + case 'double': + return ''. $xmlrpc_value->data .''; + break; + case 'string': + // Note: we don't escape apostrophes because of the many blogging clients + // that don't support numerical entities (and XML in general) properly. + return ''. htmlspecialchars($xmlrpc_value->data) .''; + break; + case 'array': + $return = ''."\n"; + foreach ($xmlrpc_value->data as $item) { + $return .= ' '. xmlrpc_value_get_xml($item) ."\n"; + } + $return .= ''; + return $return; + break; + case 'struct': + $return = ''."\n"; + foreach ($xmlrpc_value->data as $name => $value) { + $return .= " ". check_plain($name) .""; + $return .= xmlrpc_value_get_xml($value)."\n"; + } + $return .= ''; + return $return; + break; + case 'date': + return xmlrpc_date_get_xml($xmlrpc_value->data); + break; + case 'base64': + return xmlrpc_base64_get_xml($xmlrpc_value->data); + break; + } + return FALSE; +} + +/** + * Construct an object representing an XML-RPC message. + * + * @param $message + * String containing XML as defined at http://www.xmlrpc.com/spec + * @return + * Object + */ +function xmlrpc_message($message) { + $xmlrpc_message = new stdClass(); + $xmlrpc_message->array_structs = array(); // The stack used to keep track of the current array/struct + $xmlrpc_message->array_structs_types = array(); // The stack used to keep track of if things are structs or array + $xmlrpc_message->current_struct_name = array(); // A stack as well + $xmlrpc_message->message = $message; + return $xmlrpc_message; +} + +/** + * Parse an XML-RPC message. If parsing fails, the faultCode and faultString + * will be added to the message object. + * + * @param $xmlrpc_message + * Object generated by xmlrpc_message() + * @return + * TRUE if parsing succeeded; FALSE otherwise + */ +function xmlrpc_message_parse(&$xmlrpc_message) { + // First remove the XML declaration + $xmlrpc_message->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $xmlrpc_message->message); + if (trim($xmlrpc_message->message) == '') { + return FALSE; + } + $xmlrpc_message->_parser = xml_parser_create(); + // Set XML parser to take the case of tags into account + xml_parser_set_option($xmlrpc_message->_parser, XML_OPTION_CASE_FOLDING, FALSE); + // Set XML parser callback functions + /* Do not set object. $xmlrpc_message does not have member functions any more + xml_set_object($xmlrpc_message->_parser, $xmlrpc_message); */ + xml_set_element_handler($xmlrpc_message->_parser, 'xmlrpc_message_tag_open', 'xmlrpc_message_tag_close'); + xml_set_character_data_handler($xmlrpc_message->_parser, 'xmlrpc_message_cdata'); + xmlrpc_message_set($xmlrpc_message); + if (!xml_parse($xmlrpc_message->_parser, $xmlrpc_message->message)) { + return FALSE; + } + xml_parser_free($xmlrpc_message->_parser); + // Grab the error messages, if any + $xmlrpc_message = xmlrpc_message_get(); + if ($xmlrpc_message->messagetype == 'fault') { + $xmlrpc_message->fault_code = $xmlrpc_message->params[0]['faultCode']; + $xmlrpc_message->fault_string = $xmlrpc_message->params[0]['faultString']; + } + return TRUE; +} + +/** + * Store a copy of the $xmlrpc_message object temporarily. + * + * @param $value + * Object + * @return + * The most recently stored $xmlrpc_message + */ +function xmlrpc_message_set($value = NULL) { + static $xmlrpc_message; + if ($value) { + $xmlrpc_message = $value; + } + return $xmlrpc_message; +} + +function xmlrpc_message_get() { + return xmlrpc_message_set(); +} + +function xmlrpc_message_tag_open($parser, $tag, $attr) { + $xmlrpc_message = xmlrpc_message_get(); + $xmlrpc_message->current_tag_contents = ''; + $xmlrpc_message->last_open = $tag; + switch($tag) { + case 'methodCall': + case 'methodResponse': + case 'fault': + $xmlrpc_message->messagetype = $tag; + break; + // Deal with stacks of arrays and structs + case 'data': + $xmlrpc_message->array_structs_types[] = 'array'; + $xmlrpc_message->array_structs[] = array(); + break; + case 'struct': + $xmlrpc_message->array_structs_types[] = 'struct'; + $xmlrpc_message->array_structs[] = array(); + break; + } + xmlrpc_message_set($xmlrpc_message); +} + +function xmlrpc_message_cdata($parser, $cdata) { + $xmlrpc_message = xmlrpc_message_get(); + $xmlrpc_message->current_tag_contents .= $cdata; + xmlrpc_message_set($xmlrpc_message); +} + +function xmlrpc_message_tag_close($parser, $tag) { + $xmlrpc_message = xmlrpc_message_get(); + $value_flag = FALSE; + switch($tag) { + case 'int': + case 'i4': + $value = (int)trim($xmlrpc_message->current_tag_contents); + $value_flag = TRUE; + break; + case 'double': + $value = (double)trim($xmlrpc_message->current_tag_contents); + $value_flag = TRUE; + break; + case 'string': + $value = $xmlrpc_message->current_tag_contents; + $value_flag = TRUE; + break; + case 'dateTime.iso8601': + $value = xmlrpc_date(trim($xmlrpc_message->current_tag_contents)); + // $value = $iso->getTimestamp(); + $value_flag = TRUE; + break; + case 'value': + // If no type is indicated, the type is string + // We take special care for empty values + if (trim($xmlrpc_message->current_tag_contents) != '' || $xmlrpc_message->last_open == 'value') { + $value = (string)$xmlrpc_message->current_tag_contents; + $value_flag = TRUE; + } + unset($xmlrpc_message->last_open); + break; + case 'boolean': + $value = (boolean)trim($xmlrpc_message->current_tag_contents); + $value_flag = TRUE; + break; + case 'base64': + $value = base64_decode(trim($xmlrpc_message->current_tag_contents)); + $value_flag = TRUE; + break; + // Deal with stacks of arrays and structs + case 'data': + case 'struct': + $value = array_pop($xmlrpc_message->array_structs ); + array_pop($xmlrpc_message->array_structs_types); + $value_flag = TRUE; + break; + case 'member': + array_pop($xmlrpc_message->current_struct_name); + break; + case 'name': + $xmlrpc_message->current_struct_name[] = trim($xmlrpc_message->current_tag_contents); + break; + case 'methodName': + $xmlrpc_message->methodname = trim($xmlrpc_message->current_tag_contents); + break; + } + if ($value_flag) { + if (count($xmlrpc_message->array_structs ) > 0) { + // Add value to struct or array + if ($xmlrpc_message->array_structs_types[count($xmlrpc_message->array_structs_types)-1] == 'struct') { + // Add to struct + $xmlrpc_message->array_structs [count($xmlrpc_message->array_structs )-1][$xmlrpc_message->current_struct_name[count($xmlrpc_message->current_struct_name)-1]] = $value; + } + else { + // Add to array + $xmlrpc_message->array_structs [count($xmlrpc_message->array_structs )-1][] = $value; + } + } + else { + // Just add as a parameter + $xmlrpc_message->params[] = $value; + } + } + if (!in_array($tag, array("data", "struct", "member"))) { + $xmlrpc_message->current_tag_contents = ''; + } + xmlrpc_message_set($xmlrpc_message); +} + +/** + * Construct an object representing an XML-RPC request + * + * @param $method + * The name of the method to be called + * @param $args + * An array of parameters to send with the method. + * @return + * Object + */ +function xmlrpc_request($method, $args) { + $xmlrpc_request = new stdClass(); + $xmlrpc_request->method = $method; + $xmlrpc_request->args = $args; + $xmlrpc_request->xml = << + +{$xmlrpc_request->method} + + +EOD; + foreach ($xmlrpc_request->args as $arg) { + $xmlrpc_request->xml .= ''; + $v = xmlrpc_value($arg); + $xmlrpc_request->xml .= xmlrpc_value_get_xml($v); + $xmlrpc_request->xml .= "\n"; + } + $xmlrpc_request->xml .= ''; + return $xmlrpc_request; +} + + +function xmlrpc_error($code = NULL, $message = NULL) { + static $xmlrpc_error; + if (isset($code)) { + $xmlrpc_error = new stdClass(); + $xmlrpc_error->is_error = TRUE; + $xmlrpc_error->code = $code; + $xmlrpc_error->message = $message; + } + return $xmlrpc_error; +} + +function xmlrpc_error_get_xml($xmlrpc_error) { + return << + + + + + faultCode + {$xmlrpc_error->code} + + + faultString + {$xmlrpc_error->message} + + + + + + +EOD; +} + +function xmlrpc_date($time) { + $xmlrpc_date = new stdClass(); + $xmlrpc_date->is_date = TRUE; + // $time can be a PHP timestamp or an ISO one + if (is_numeric($time)) { + $xmlrpc_date->year = date('Y', $time); + $xmlrpc_date->month = date('m', $time); + $xmlrpc_date->day = date('d', $time); + $xmlrpc_date->hour = date('H', $time); + $xmlrpc_date->minute = date('i', $time); + $xmlrpc_date->second = date('s', $time); + $xmlrpc_date->iso8601 = date('Ymd\TH:i:s'); + } + else { + $xmlrpc_date->year = substr($time, 0, 4); + $xmlrpc_date->month = substr($time, 4, 2); + $xmlrpc_date->day = substr($time, 6, 2); + $xmlrpc_date->hour = substr($time, 9, 2); + $xmlrpc_date->minute = substr($time, 12, 2); + $xmlrpc_date->second = substr($time, 15, 2); + $xmlrpc_date->iso8601 = $time; + } + return $xmlrpc_date; +} + +function xmlrpc_date_get_xml($xmlrpc_date) { + return ''. $xmlrpc_date->year . $xmlrpc_date->month . $xmlrpc_date->day .'T'. $xmlrpc_date->hour .':'. $xmlrpc_date->minute .':'. $xmlrpc_date->second .''; +} + +function xmlrpc_base64($data) { + $xmlrpc_base64 = new stdClass(); + $xmlrpc_base64->is_base64 = TRUE; + $xmlrpc_base64->data = $data; + return $xmlrpc_base64; +} + +function xmlrpc_base64_get_xml($xmlrpc_base64) { + return ''. base64_encode($xmlrpc_base64->data) .''; +} + +/** + * Execute an XML remote procedural call. This is private function; call xmlrpc() + * in common.inc instead of this functino. + * + * @return + * A $xmlrpc_message object if the call succeeded; FALSE if the call failed + */ +function _xmlrpc() { + $args = func_get_args(); + $url = array_shift($args); + if (is_array($args[0])) { + $method = 'system.multicall'; + $multicall_args = array(); + foreach ($args[0] as $call) { + $multicall_args[] = array('methodName' => array_shift($call),'params' => $call); + } + $args = array($multicall_args); + } + else { + $method = array_shift($args); + } + $xmlrpc_request = xmlrpc_request($method, $args); + $result = drupal_http_request($url, array("Content-Type" => "text/xml"), 'POST', $xmlrpc_request->xml); + if ($result->code != 200) { + xmlrpc_error(-$result->code, $result->error); + return FALSE; + } + $message = xmlrpc_message($result->data); + // Now parse what we've got back + if (!xmlrpc_message_parse($message)) { + // XML error + xmlrpc_error(-32700, t('Parse error. Not well formed')); + return FALSE; + } + // Is the message a fault? + if ($message->messagetype == 'fault') { + xmlrpc_error($message->fault_code, $message->fault_string); + return FALSE; + } + // Message must be OK + return $message->params[0]; +} + +/** + * Returns the last XML-RPC client error number + */ +function xmlrpc_errno() { + $error = xmlrpc_error(); + return $error->code; +} + +/** + * Returns the last XML-RPC client error message + */ +function xmlrpc_error_msg() { + $error = xmlrpc_error(); + return $error->message; +} diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc new file mode 100644 index 0000000..3b90f5f --- /dev/null +++ b/includes/xmlrpcs.inc @@ -0,0 +1,318 @@ + 'xmlrpc_server_multicall', + array( + 'system.methodSignature', + 'xmlrpc_server_method_signature', + array('array', 'string'), + 'Returns an array describing the return type and required parameters of a method.' + ), + array( + 'system.getCapabilities', + 'xmlrpc_server_get_capabilities', + array('struct'), + 'Returns a struct describing the XML-RPC specifications supported by this server.' + ), + array( + 'system.listMethods', + 'xmlrpc_server_list_methods', + array('array'), + 'Returns an array of available methods on this server.'), + array( + 'system.methodHelp', + 'xmlrpc_server_method_help', + array('string', 'string'), + 'Returns a documentation string for the specified method.') + ); + // We build an array of all method names by combining the built-ins + // with those defined by modules implementing the _xmlrpc hook. + // Built-in methods are overridable. + foreach (array_merge($defaults, (array)$callbacks) as $key => $callback) { + // we could check for is_array($callback) + if (is_int($key)) { + $method = $callback[0]; + $xmlrpc_server->callbacks[$method] = $callback[1]; + $xmlrpc_server->signatures[$method] = $callback[2]; + $xmlrpc_server->help[$method] = $callback[3]; + } + else { + $xmlrpc_server->callbacks[$key] = $callback; + $xmlrpc_server->signatures[$key] = ''; + $xmlrpc_server->help[$key] = ''; + } + } + + $data = file_get_contents('php://input'); + if (!$data) { + die('XML-RPC server accepts POST requests only.'); + } + $xmlrpc_server->message = xmlrpc_message($data); + if (!xmlrpc_message_parse($xmlrpc_server->message)) { + xmlrpc_server_error(-32700, t('Parse error. Request not well formed.')); + } + if ($xmlrpc_server->message->messagetype != 'methodCall') { + xmlrpc_server_error(-32600, t('Server error. Invalid XML-RPC. Request must be a methodCall.')); + } + xmlrpc_server_set($xmlrpc_server); + $result = xmlrpc_server_call($xmlrpc_server, $xmlrpc_server->message->methodname, $xmlrpc_server->message->params); + + if ($result->is_error) { + xmlrpc_server_error($result); + } + // Encode the result + $r = xmlrpc_value($result); + // Create the XML + $xml = ' + + + + '. + xmlrpc_value_get_xml($r) + .' + + + + +'; + // Send it + xmlrpc_server_output($xml); +} + +/** + * Throw an XML-RPC error. + * + * @param $error + * an error object OR integer error code + * @param $message + * description of error, used only if integer error code was passed + */ +function xmlrpc_server_error($error, $message = false) { + if ($message && !is_object($error)) { + $error = xmlrpc_error($error, $message); + } + xmlrpc_server_output(xmlrpc_error_get_xml($error)); +} + +function xmlrpc_server_output($xml) { + $xml = ''."\n". $xml; + header('Connection: close'); + header('Content-Length: '. strlen($xml)); + header('Content-Type: text/xml'); + header('Date: '.date('r')); + echo $xml; + exit; +} + +/** + * Store a copy of the request temporarily. + * + * @param $xmlrpc_server + * Request object created by xmlrpc_server(). + */ +function xmlrpc_server_set($xmlrpc_server = NULL) { + static $server; + if (!isset($server)) { + $server = $xmlrpc_server; + } + return $server; +} + +// Retrieve the stored request. +function xmlrpc_server_get() { + return xmlrpc_server_set(); +} + +/** + * Dispatch the request and any parameters to the appropriate handler. + * + * @param $xmlrpc_server + * @param $methodname + * The external XML-RPC method name, e.g. 'system.methodHelp' + * @param $args + * Array containing any parameters that were sent along with the request. + */ +function xmlrpc_server_call($xmlrpc_server, $methodname, $args) { + // Make sure parameters are in an array + if ($args && !is_array($args)) { + $args = array($args); + } + // Has this method been mapped to a Drupal function by us or by modules? + if (!isset($xmlrpc_server->callbacks[$methodname])) { + return xmlrpc_error(-32601, t('Server error. Requested method %methodname not specified.', array("%methodname" => $xmlrpc_server->message->methodname))); + } + $method = $xmlrpc_server->callbacks[$methodname]; + $signature = $xmlrpc_server->signatures[$methodname]; + + // If the method has a signature, validate the request against the signature + if (is_array($signature)) { + $ok = true; + $return_type = array_shift($signature); + // Check the number of arguments + if (count($args) != count($signature)) { + return xmlrpc_error(-32602, t('Server error. Wrong number of method parameters.')); + } + // Check the argument types + foreach ($signature as $key => $type) { + $arg = $args[$key]; + switch ($type) { + case 'int': + case 'i4': + if (is_array($arg) || !is_int($arg)) { + $ok = false; + } + break; + case 'base64': + case 'string': + if (!is_string($arg)) { + $ok = false; + } + break; + case 'boolean': + if ($arg !== false && $arg !== true) { + $ok = false; + } + break; + case 'float': + case 'double': + if (!is_float($arg)) { + $ok = false; + } + break; + case 'date': + case 'dateTime.iso8601': + if (!$arg->is_date) { + $ok = false; + } + break; + } + if (!$ok) { + return xmlrpc_error(-32602, t('Server error. Invalid method parameters.')); + } + } + } + /* + if (count($args) == 1) { + // If only one parameter just send that instead of the whole array + $args = $args[0]; + } + */ + if (!function_exists($method)) { + return xmlrpc_error(-32601, t('Server error. Requested function %method does not exist.', array("%method" => $method))); + } + // Call the mapped function + return call_user_func_array($method, $args); +} + +function xmlrpc_server_multicall($methodcalls) { + // See http://www.xmlrpc.com/discuss/msgReader$1208 + $return = array(); + $xmlrpc_server = xmlrpc_server_get(); + foreach ($methodcalls as $call) { + $ok = true; + if (!isset($call['methodName']) || !isset($call['params'])) { + $result = xmlrpc_error(3, t('Invalid syntax for system.multicall.')); + $ok = false; + } + $method = $call['methodName']; + $params = $call['params']; + if ($method == 'system.multicall') { + $result = xmlrpc_error(-32600, t('Recursive calls to system.multicall are forbidden.')); + } + elseif ($ok) { + $result = xmlrpc_server_call($xmlrpc_server, $method, $params); + } + if ($result->is_error) { + $return[] = array( + 'faultCode' => $result->code, + 'faultString' => $result->message + ); + } + else { + $return[] = $result; + } + } + return $return; +} + + +/** + * XML-RPC method system.listMethods maps to this function. + */ +function xmlrpc_server_list_methods() { + $xmlrpc_server = xmlrpc_server_get(); + return array_keys($xmlrpc_server->callbacks); +} + +/** + * XML-RPC method system.getCapabilities maps to this function. + * See http://groups.yahoo.com/group/xml-rpc/message/2897 + */ +function xmlrpc_server_get_capabilities() { + return array( + 'xmlrpc' => array( + 'specUrl' => 'http://www.xmlrpc.com/spec', + 'specVersion' => 1 + ), + 'faults_interop' => array( + 'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php', + 'specVersion' => 20010516 + ), + 'system.multicall' => array( + 'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208', + 'specVersion' => 1 + ), + 'introspection' => array( + 'specUrl' => 'http://scripts.incutio.com/xmlrpc/introspection.html', + 'specVersion' => 1 + ) + ); +} + +/** + * XML-RPC method system.methodSignature maps to this function. + * + * @param $methodname + * Name of method for which we return a method signature. + * @return array + * An array of types representing the method signature of the + * function that the methodname maps to. The methodSignature of + * this function is 'array', 'string' because it takes an array + * and returns a string. + */ +function xmlrpc_server_method_signature($methodname) { + $xmlrpc_server = xmlrpc_server_get(); + if (!isset($xmlrpc_server->callbacks[$methodname])) { + return xmlrpc_error(-32601, t('Server error. Requested method %methodname not specified.', array("%methodname" => $methodname))); + } + if (!is_array($xmlrpc_server->signatures[$methodname])) { + return xmlrpc_error(-32601, t('Server error. Requested method %methodname signature not specified.', array("%methodname" => $methodname))); + } + // We array of types + $return = array(); + foreach ($xmlrpc_server->signatures[$methodname] as $type) { + $return[] = $type; + } + return $return; +} + +/** + * XML-RPC method system.methodHelp maps to this function. + * + * @param $method + * Name of method for which we return a help string. + */ +function xmlrpc_server_method_help($method) { + $xmlrpc_server = xmlrpc_server_get(); + return $xmlrpc_server->help[$method]; +} \ No newline at end of file diff --git a/index.php b/index.php new file mode 100644 index 0000000..9f750d7 --- /dev/null +++ b/index.php @@ -0,0 +1,35 @@ + 0) + this.populatePopup(); + else + this.hidePopup(e.keyCode); + return true; + } +} + +/** + * Puts the currently highlighted suggestion into the autocomplete field + */ +jsAC.prototype.select = function (node) { + this.input.value = node.autocompleteValue; +} + +/** + * Highlights the next suggestion + */ +jsAC.prototype.selectDown = function () { + if (this.selected && this.selected.nextSibling) { + this.highlight(this.selected.nextSibling); + } + else { + var lis = this.popup.getElementsByTagName('li'); + if (lis.length > 0) { + this.highlight(lis[0]); + } + } +} + +/** + * Highlights the previous suggestion + */ +jsAC.prototype.selectUp = function () { + if (this.selected && this.selected.previousSibling) { + this.highlight(this.selected.previousSibling); + } +} + +/** + * Highlights a suggestion + */ +jsAC.prototype.highlight = function (node) { + removeClass(this.selected, 'selected'); + addClass(node, 'selected'); + this.selected = node; +} + +/** + * Unhighlights a suggestion + */ +jsAC.prototype.unhighlight = function (node) { + removeClass(node, 'selected'); + this.selected = false; +} + +/** + * Positions the suggestions popup and starts a search + */ +jsAC.prototype.populatePopup = function () { + var ac = this; + var pos = absolutePosition(this.input); + this.selected = false; + this.popup.style.top = (pos.y + this.input.offsetHeight) +'px'; + this.popup.style.left = pos.x +'px'; + this.popup.style.width = (this.input.offsetWidth - 4) +'px'; + this.db.owner = this; + this.db.search(this.input.value); +} + +/** + * Fills the suggestion popup with any matches received + */ +jsAC.prototype.found = function (matches) { + while (this.popup.hasChildNodes()) { + this.popup.removeChild(this.popup.childNodes[0]); + } + if (!this.popup.parentNode || !this.popup.parentNode.tagName) { + document.getElementsByTagName('body')[0].appendChild(this.popup); + } + var ul = document.createElement('ul'); + var ac = this; + + for (key in matches) { + var li = document.createElement('li'); + var div = document.createElement('div'); + div.innerHTML = matches[key]; + li.appendChild(div); + li.autocompleteValue = key; + li.onmousedown = function() { ac.select(this); }; + li.onmouseover = function() { ac.highlight(this); }; + li.onmouseout = function() { ac.unhighlight(this); }; + ul.appendChild(li); + } + + if (ul.childNodes.length > 0) { + this.popup.appendChild(ul); + } + else { + this.hidePopup(); + } + removeClass(this.input, 'throbbing'); +} + +/** + * An AutoComplete DataBase object + */ +function ACDB(uri) { + this.uri = uri; + this.delay = 300; + this.cache = {}; +} + +/** + * Performs a cached and delayed search + */ +ACDB.prototype.search = function(searchString) { + this.searchString = searchString; + if (this.cache[searchString]) { + return this.owner.found(this.cache[searchString]); + } + if (this.timer) { + clearTimeout(this.timer); + } + var db = this; + this.timer = setTimeout(function() { + addClass(db.owner.input, 'throbbing'); + db.transport = HTTPGet(db.uri +'/'+ encodeURIComponent(searchString), db.receive, db); + }, this.delay); +} + +/** + * HTTP callback function. Passes suggestions to the autocomplete object + */ +ACDB.prototype.receive = function(string, xmlhttp, acdb) { + // Note: Safari returns 'undefined' status if the request returns no data. + if (xmlhttp.status != 200 && typeof xmlhttp.status != 'undefined') { + removeClass(acdb.owner.input, 'throbbing'); + return alert('An HTTP error '+ xmlhttp.status +' occured.\n'+ acdb.uri); + } + // Parse back result + var matches = parseJson(string); + if (typeof matches['status'] == 'undefined' || matches['status'] != 0) { + acdb.cache[acdb.searchString] = matches; + acdb.owner.found(matches); + } +} + +/** + * Cancels the current autocomplete request + */ +ACDB.prototype.cancel = function() { + if (this.owner) removeClass(this.owner.input, 'throbbing'); + if (this.timer) clearTimeout(this.timer); + if (this.transport) { + this.transport.onreadystatechange = function() {}; + this.transport.abort(); + } +} diff --git a/misc/blog.png b/misc/blog.png new file mode 100644 index 0000000..2518905 Binary files /dev/null and b/misc/blog.png differ diff --git a/misc/collapse.js b/misc/collapse.js new file mode 100644 index 0000000..c797a2c --- /dev/null +++ b/misc/collapse.js @@ -0,0 +1,70 @@ +// $Id: collapse.js 144 2007-03-28 07:52:20Z thierry $ + +if (isJsEnabled()) { + addLoadEvent(collapseAutoAttach); +} + +function collapseAutoAttach() { + var fieldsets = document.getElementsByTagName('fieldset'); + var legend, fieldset; + for (var i = 0; fieldset = fieldsets[i]; i++) { + if (!hasClass(fieldset, 'collapsible')) { + continue; + } + legend = fieldset.getElementsByTagName('legend'); + if (legend.length == 0) { + continue; + } + legend = legend[0]; + var a = document.createElement('a'); + a.href = '#'; + a.onclick = function() { + toggleClass(this.parentNode.parentNode, 'collapsed'); + if (!hasClass(this.parentNode.parentNode, 'collapsed')) { + collapseScrollIntoView(this.parentNode.parentNode); + if (typeof textAreaAutoAttach != 'undefined') { + // Add the grippie to a textarea in a collapsed fieldset. + textAreaAutoAttach(null, this.parentNode.parentNode); + } + } + this.blur(); + return false; + }; + a.innerHTML = legend.innerHTML; + while (legend.hasChildNodes()) { + removeNode(legend.childNodes[0]); + } + legend.appendChild(a); + collapseEnsureErrorsVisible(fieldset); + } +} + +function collapseEnsureErrorsVisible(fieldset) { + if (!hasClass(fieldset, 'collapsed')) { + return; + } + var inputs = []; + inputs = inputs.concat(fieldset.getElementsByTagName('input')); + inputs = inputs.concat(fieldset.getElementsByTagName('textarea')); + inputs = inputs.concat(fieldset.getElementsByTagName('select')); + for (var j = 0; j<3; j++) { + for (var i = 0; i < inputs[j].length; i++) { + if (hasClass(inputs[j][i], 'error')) { + return removeClass(fieldset, 'collapsed'); + } + } + } +} + +function collapseScrollIntoView(node) { + var h = self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight || 0; + var offset = self.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0; + var pos = absolutePosition(node); + if (pos.y + node.scrollHeight > h + offset) { + if (node.scrollHeight > h) { + window.scrollTo(0, pos.y); + } else { + window.scrollTo(0, pos.y + node.scrollHeight - h); + } + } +} diff --git a/misc/degree2decimal.py b/misc/degree2decimal.py new file mode 100755 index 0000000..873cd54 --- /dev/null +++ b/misc/degree2decimal.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python +# transforms a degree notation like +# 43:36:56.32 (43 degrees 36 minutes 56.32 seconds) +# into a decimal notation + +import sys +import re +pattern="^(-*\d+):(\d+):([\d\.]+)$" +matcher=re.compile(pattern) + +minute=1./60 +second=1./3600 + +def translate (coord): + r=matcher.match(coord) + if not r: + print 'failed to parse',coord,'pattern=',pattern + else: + (deg,min,sec)=map(float,r.groups()) +# print 'deg',deg,'min',min,'sec',sec + if (deg>0): + print coord,'->',deg+min*minute+sec*second + else: + print coord,'->',deg-min*minute-sec*second + + +def main(): + for arg in sys.argv[1:]: + translate(arg) + +if __name__ == '__main__': + main() diff --git a/misc/drupal.css b/misc/drupal.css new file mode 100644 index 0000000..03b90f6 --- /dev/null +++ b/misc/drupal.css @@ -0,0 +1,676 @@ +/* $Id: drupal.css 144 2007-03-28 07:52:20Z thierry $ */ + +/* +** HTML elements +*/ +fieldset { + margin-bottom: 1em; + padding: .5em; +} +form { + margin: 0; + padding: 0; +} +hr { + height: 1px; + border: 1px solid gray; +} +img { + border: 0; +} +table { + border-collapse: collapse; +} +th { + text-align: left; + padding-right: 1em; + border-bottom: 3px solid #ccc; +} +th.active img { + display: inline; +} +tr.even, tr.odd { + background-color: #eee; + border-bottom: 1px solid #ccc; +} +tr.even, tr.odd { + padding: 0.1em 0.6em; +} +td.active { + background-color: #ddd; +} + +/* +** Menu styles +*/ +ul.menu { + list-style: none; + border: none; + text-align:left; +} +ul.menu li { + margin: 0 0 0 0.5em; +} +li.expanded { + list-style-type: circle; + list-style-image: url(menu-expanded.png); + padding: 0.2em 0.5em 0 0; + margin: 0; +} +li.collapsed { + list-style-type: disc; + list-style-image: url(menu-collapsed.png); + padding: 0.2em 0.5em 0 0; + margin: 0; +} +li.leaf { + list-style-type: square; + list-style-image: url(menu-leaf.png); + padding: 0.2em 0.5em 0 0; + margin: 0; +} +li a.active { + color: #000; +} +td.menu-disabled { + background: #ccc; +} + +/* +** Other common styles +*/ +.breadcrumb { + padding-bottom: .5em +} +.block-region { + background-color: #ffff66; + margin-top: 4px; + margin-bottom: 4px; + padding: 3px; +} +.block ul { + margin: 0; + padding: 0 0 0.25em 1em; +} +br.clear { + clear: both; + height: 0; +} +.container-inline div { + display: inline; +} +.error { + color: red; +} +.item-list .icon { + color: #555; + float: right; + padding-left: 0.25em; + clear: right; +} +.item-list .icon a { + color: #000; + text-decoration: none; +} +.item-list .icon a:hover { + color: #000; + text-decoration: none; +} +.item-list .title { + font-weight: bold; +} +.item-list ul { + margin: 0 0 0.75em 0; + padding: 0; +} +.item-list ul li { + margin: 0 0 0.25em 1.5em; + padding: 0; + list-style: disc; +} +.form-item { + margin-top: 1em; + margin-bottom: 1em; +} +tr.odd .form-item, tr.even .form-item { + margin-top: 0; + margin-bottom: 0; + white-space: nowrap; +} +.form-item input.error, .form-item textarea.error { + border: 2px solid red; +} +.form-item .description { + font-size: 0.85em; +} +.form-item label { + display: block; + font-weight: bold; +} +.form-item label.option { + display: inline; + font-weight: normal; +} +.marker, .form-required { + color: #f00; +} +.more-link { + text-align: right; +} +.node-form .form-text { + display: block; + width: 95%; +} +.node-form .standard { + clear: both; +} +.node-form textarea { + display: block; + width: 95%; +} +.node-form .attachments fieldset { + float: none; + display: block; +} +.nowrap { + white-space: nowrap; +} +.ok { + color: #080; +} +#pager { + clear: both; + text-align: center; +} +#pager a, #pager strong.pager-current { + padding: 0.5em; +} +.path { + padding-bottom: 0.7em; + font-size: 1.1em; +} + +/* +** Module specific styles +*/ +#aggregator .feed-source .feed-title { + margin-top: 0; +} +#aggregator .feed-source .feed-image img { + margin-bottom: 0.75em; +} +#aggregator .feed-source .feed-icon { + float: right; + display: block; +} +#aggregator .feed-item { + margin-bottom: 1.5em; +} +#aggregator .feed-item-title { + margin-bottom: 0; + font-size: 1.3em; +} +#aggregator .feed-item-meta, #aggregator .feed-item-body { + margin-bottom: 0.5em; +} +#aggregator .feed-item-categories { + font-size: 0.9em; +} +#aggregator td { + vertical-align: bottom; +} +#aggregator td.categorize-item { + white-space: nowrap; +} +#aggregator .categorize-item .news-item .body { + margin-top: 0; +} +#aggregator .categorize-item h3 { + margin-bottom: 1em; + margin-top: 0; +} +.book-navigation .menu { + border-top: 1px solid #888; + padding: 1em 0 0 3em; +} +.book-navigation .page-links { + border-top: 1px solid #888; + border-bottom: 1px solid #888; + text-align: center; + padding: 0.5em; +} +.book-navigation .page-previous { + text-align: right; +} +.book-navigation .page-up { + margin: 0 4em; +} +.book-navigation .page-next { + text-align: left; +} +.node-unpublished, .comment-unpublished { + background-color: #fff4f4; +} +.preview .node, .preview .comment { + background-color: #ffffea; +} +.archive { + margin: 1em 0 1em 0; +} +.calendar .row-week td a { + display: block; +} +.calendar .row-week td a:hover { + background-color: #888; color: #fff; +} +.calendar a { + text-decoration: none; +} +.calendar a:hover { + text-decoration: none; +} +.calendar table { + border-collapse: collapse; + width: 100%; + border: 1px solid #000; +} +.calendar td, .calendar th { + text-align: center; + border: 1px solid #000; + padding: 1px; + margin: 0; + font-size: 0.8em; +} +.calendar td.day-blank { + border: 0; +} +.tips { + margin-top: 0; + margin-bottom: 0; + padding-top: 0; + padding-bottom: 0; + font-size: 0.9em; +} +#forum .description { + font-size: 0.9em; + margin: 0.5em; +} +#forum td.created, #forum td.posts, #forum td.topics, #forum td.last-reply, #forum td.replies, #forum td.pager { + white-space: nowrap; +} +#forum td.posts, #forum td.topics, #forum td.replies, #forum td.pager { + text-align: center; +} +.forum-topic-navigation { + padding: 1em 0 0 3em; + border-top: 1px solid #888; + border-bottom: 1px solid #888; + text-align: center; + padding: 0.5em; +} +.forum-topic-navigation .topic-previous { + margin-right: 4em; + text-align: right; +} +.forum-topic-navigation .topic-next { + text-align: left; +} +.locale-untranslated { + font-style: normal; + text-decoration: line-through; +} +#node-admin-filter ul { + list-style-type: none; + padding: 0; + margin: 0; + width: 100%; +} +#node-admin-buttons { + float: left; + margin-left: 0.5em; + clear: right; +} +td.revision-current { + background: #ffc; +} +dl.multiselect dd.b, dl.multiselect dd.b .form-item, dl.multiselect dd.b select { + font-family: inherit; + font-size: inherit; + width: 14em; +} +dl.multiselect dd.a, dl.multiselect dd.a .form-item { + width: 8em; +} +dl.multiselect dt, dl.multiselect dd { + float: left; + line-height: 1.75em; + padding: 0; + margin: 0 1em 0 0; +} +dl.multiselect .form-item { + height: 1.75em; + margin: 0; +} +#permissions td.module, #blocks td.region { + font-weight: bold; +} +#permissions td.permission, #blocks td.block, #taxonomy td.term, #taxonomy td.message { + padding-left: 1.5em; +} + +#access-rules .access-type, #access-rules .rule-type { + margin-right: 1em; + float: left; +} +#access-rules .access-type .form-item, #access-rules .rule-type .form-item { + margin-top: 0; +} +#access-rules .mask { + clear: both; +} +.poll .bar { + height: 1em; + margin: 1px 0; + background-color: #ddd; +} +.poll .bar .foreground { + background-color: #000; + height: 1em; + clear: left; + float: left; +} +.poll .links { + text-align: center; +} +.poll .percent { + text-align: right; +} +.poll .total { + text-align: center; +} +.poll .vote-form { + text-align: center; +} +.poll .vote-form .choices { + text-align: left; + margin: 0 auto; + display: table; +} +.profile { + clear: both; + margin: 1em 0 1em 0; +} +.profile .picture { + float: right; + margin: 0 1em 1em 0; +} +.profile dt { + margin: 1em 0 0.2em 0; + font-weight: bold; +} +.profile dd { + margin:0; +} +.node-form .poll-form fieldset { + display: block; +} +img.screenshot { + border: 1px solid #808080; + display: block; + margin: 2px; +} +.search-form { + margin-bottom: 1em; +} +.search-form p { + margin-top: 0; + margin-bottom: 0.2em; + padding-top: 0; + padding-bottom: 0; +} +.search-form input { + margin-top: 0; + margin-bottom: 0; +} +.search-results p { + margin-top: 0; +} +.search-results dt { + font-size: 1.1em; +} +.search-results dd { + margin-bottom: 1em; +} +.search-results .search-info { + font-size: 0.85em; +} +.search-advanced .criterion { + float: left; + margin-right: 2em; +} +.search-advanced .action { + float: left; + clear: left; +} +#tracker td.replies { + text-align: center; +} +#tracker table { + width: 100%; +} +.theme-settings-left { + float: left; + width: 49%; +} +.theme-settings-right { + float: right; + width: 49%; +} +.theme-settings-bottom { + clear: both; +} +#user-login-form { + text-align: center; +} +.more-help-link { + font-size: 0.85em; + text-align: right; +} +table.watchdog-event th { + border-bottom: 1px solid #ccc; +} +tr.watchdog-user { + background: #ffd; +} +tr.watchdog-user .active { + background: #eed; +} +tr.watchdog-content { + background: #ddf; +} +tr.watchdog-content .active { + background: #cce; +} +tr.watchdog-page-not-found, tr.watchdog-access-denied { + background: #dfd; +} +tr.watchdog-page-not-found .active, tr.watchdog-access-denied .active { + background: #cec; +} +tr.watchdog-error { + background: #ffc9c9; +} +tr.watchdog-error .active { + background: #eeb9b9; +} + +/* Tab navigation */ +ul.primary { + border-collapse: collapse; + padding: 0 0 0 1em; + white-space: nowrap; + list-style: none; + margin: 5px; + height: auto; + line-height: normal; + border-bottom: 1px solid #bbb; +} +ul.primary li { + display: inline; +} +ul.primary li a { + background-color: #ddd; + border-color: #bbb; + border-width: 1px; + border-style: solid solid none solid; + height: auto; + margin-right: 0.5em; + padding: 0 1em; + text-decoration: none; +} +ul.primary li.active a { + background-color: #fff; + border: 1px solid #bbb; + border-bottom: #fff 1px solid; +} +ul.primary li a:hover { + background-color: #eee; + border-color: #ccc; + border-bottom-color: #eee; +} +ul.secondary { + border-bottom: 1px solid #bbb; + padding: 0.5em 1em 0.5em 1em; + margin: 5px; +} +ul.secondary li { + display: inline; + padding: 0 1em; + border-right: 1px solid #ccc; +} +ul.secondary a { + padding: 0; + text-decoration: none; +} +ul.secondary a.active { + border-bottom: 4px solid #999; +} + +/* +** Help module +*/ +.help-items { + float: left; + width: 22%; + padding-right: 3%; +} +.help-items-last { + padding-right: 0; +} + +/* +** Autocomplete styles +*/ +/* Suggestion list */ +#autocomplete { + position: absolute; + border: 1px solid; + overflow: hidden; +} +#autocomplete ul { + margin: 0; + padding: 0; + list-style: none; +} +#autocomplete li { + background: #fff; + color: #000; + white-space: pre; + cursor: default; +} +#autocomplete li.selected { + background: #0072b9; + color: #fff; +} +/* Animated throbber */ +html.js input.form-autocomplete { + background-image: url(throbber.gif); + background-repeat: no-repeat; + background-position: 100% 2px; +} +html.js input.throbbing { + background-position: 100% -18px; +} + +/* +** Progressbar styles +*/ +.progress { + font-weight: bold; +} +.progress .bar { + background: #fff url(progress.gif); + border: 1px solid #00375a; + height: 1.5em; + margin-top: 0.2em; +} +.progress .filled { + background: #0072b9; + height: 1em; + border-bottom: 0.5em solid #004a73; + width: 0%; +} +.progress .percentage { + float: right; +} + +/* +** Collapsing fieldsets +*/ +html.js fieldset.collapsed { + border-bottom-width: 0; + border-left-width: 0; + border-right-width: 0; + margin-bottom: 0; +} +html.js fieldset.collapsed * { + display: none; +} +html.js fieldset.collapsed table *, +html.js fieldset.collapsed legend, +html.js fieldset.collapsed legend * { + display: inline; +} +html.js fieldset.collapsible legend a { + padding-left: 15px; + background: url(menu-expanded.png) 5px 50% no-repeat; +} +html.js fieldset.collapsed legend a { + background-image: url(menu-collapsed.png); +} +/* Note: IE-only fix due to '* html' (breaks Konqueror otherwise). */ +* html.js fieldset.collapsible legend a { + display: block; +} + +/* +** Resizable text areas +*/ +.resizable-textarea { + width: 95%; +} +.resizable-textarea .grippie { + height: 14px; + background: #eee url(grippie.png) no-repeat 100% 100%; + border: 1px solid #ddd; + border-top-width: 0; + cursor: s-resize; +} + +/* +** Formatting for welcome page +*/ +#first-time strong { + display: block; + padding: 1.5em 0 .5em; +} diff --git a/misc/drupal.js b/misc/drupal.js new file mode 100644 index 0000000..9237b26 --- /dev/null +++ b/misc/drupal.js @@ -0,0 +1,367 @@ +// $Id: drupal.js 144 2007-03-28 07:52:20Z thierry $ + +/** + * Only enable Javascript functionality if all required features are supported. + */ +function isJsEnabled() { + if (typeof document.jsEnabled == 'undefined') { + // Note: ! casts to boolean implicitly. + document.jsEnabled = !( + !document.getElementsByTagName || + !document.createElement || + !document.createTextNode || + !document.documentElement || + !document.getElementById); + } + return document.jsEnabled; +} + +// Global Killswitch on the element +if (isJsEnabled()) { + document.documentElement.className = 'js'; +} + +/** + * Make IE's XMLHTTP object accessible through XMLHttpRequest() + */ +if (typeof XMLHttpRequest == 'undefined') { + XMLHttpRequest = function () { + var msxmls = ['MSXML3', 'MSXML2', 'Microsoft'] + for (var i=0; i < msxmls.length; i++) { + try { + return new ActiveXObject(msxmls[i]+'.XMLHTTP') + } + catch (e) { } + } + throw new Error("No XML component installed!"); + } +} + +/** + * Creates an HTTP GET request and sends the response to the callback function. + * + * Note that dynamic arguments in the URI should be escaped with encodeURIComponent(). + */ +function HTTPGet(uri, callbackFunction, callbackParameter) { + var xmlHttp = new XMLHttpRequest(); + var bAsync = true; + if (!callbackFunction) { + bAsync = false; + } + xmlHttp.open('GET', uri, bAsync); + xmlHttp.send(null); + + if (bAsync) { + if (callbackFunction) { + xmlHttp.onreadystatechange = function() { + if (xmlHttp.readyState == 4) { + callbackFunction(xmlHttp.responseText, xmlHttp, callbackParameter); + } + } + } + return xmlHttp; + } + else { + return xmlHttp.responseText; + } +} + +/** + * Creates an HTTP POST request and sends the response to the callback function + * + * Note: passing null or undefined for 'object' makes the request fail in Opera 8. + * Pass an empty string instead. + */ +function HTTPPost(uri, callbackFunction, callbackParameter, object) { + var xmlHttp = new XMLHttpRequest(); + var bAsync = true; + if (!callbackFunction) { + bAsync = false; + } + xmlHttp.open('POST', uri, bAsync); + + var toSend = ''; + if (typeof object == 'object') { + xmlHttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + for (var i in object) { + toSend += (toSend ? '&' : '') + i + '=' + encodeURIComponent(object[i]); + } + } + else { + toSend = object; + } + xmlHttp.send(toSend); + + if (bAsync) { + if (callbackFunction) { + xmlHttp.onreadystatechange = function() { + if (xmlHttp.readyState == 4) { + callbackFunction(xmlHttp.responseText, xmlHttp, callbackParameter); + } + } + } + return xmlHttp; + } + else { + return xmlHttp.responseText; + } +} + +/** + * Redirects a button's form submission to a hidden iframe and displays the result + * in a given wrapper. The iframe should contain a call to + * window.parent.iframeHandler() after submission. + */ +function redirectFormButton(uri, button, handler) { + // (Re)create an iframe to target. + createIframe(); + + // Trap the button + button.onmouseover = button.onfocus = function() { + button.onclick = function() { + // Prepare variables for use in anonymous function. + var button = this; + var action = button.form.action; + var target = button.form.target; + + // Redirect form submission + this.form.action = uri; + this.form.target = 'redirect-target'; + + handler.onsubmit(); + + // Set iframe handler for later + window.iframeHandler = function () { + var iframe = $('redirect-target'); + // Restore form submission + button.form.action = action; + button.form.target = target; + + // Get response from iframe body + try { + response = (iframe.contentWindow || iframe.contentDocument || iframe).document.body.innerHTML; + // Firefox 1.0.x hack: Remove (corrupted) control characters + response = response.replace(/[\f\n\r\t]/g, ' '); + if (window.opera) { + // Opera-hack: it returns innerHTML sanitized. + response = response.replace(/"/g, '"'); + } + } + catch (e) { + response = null; + } + + $('redirect-target').onload = null; + $('redirect-target').src = 'about:blank'; + + response = parseJson(response); + // Check response code + if (response.status == 0) { + handler.onerror(response.data); + return; + } + handler.oncomplete(response.data); + } + + return true; + } + } + button.onmouseout = button.onblur = function() { + button.onclick = null; + } +} + +/** + * Adds a function to the window onload event + */ +function addLoadEvent(func) { + var oldOnload = window.onload; + if (typeof window.onload != 'function') { + window.onload = func; + } + else { + window.onload = function() { + oldOnload(); + func(); + } + } +} + +/** + * Adds a function to a given form's submit event + */ +function addSubmitEvent(form, func) { + var oldSubmit = form.onsubmit; + if (typeof oldSubmit != 'function') { + form.onsubmit = func; + } + else { + form.onsubmit = function() { + return oldSubmit() && func(); + } + } +} + +/** + * Retrieves the absolute position of an element on the screen + */ +function absolutePosition(el) { + var sLeft = 0, sTop = 0; + var isDiv = /^div$/i.test(el.tagName); + if (isDiv && el.scrollLeft) { + sLeft = el.scrollLeft; + } + if (isDiv && el.scrollTop) { + sTop = el.scrollTop; + } + var r = { x: el.offsetLeft - sLeft, y: el.offsetTop - sTop }; + if (el.offsetParent) { + var tmp = absolutePosition(el.offsetParent); + r.x += tmp.x; + r.y += tmp.y; + } + return r; +}; + +function dimensions(el) { + return { width: el.offsetWidth, height: el.offsetHeight }; +} + +/** + * Returns true if an element has a specified class name + */ +function hasClass(node, className) { + if (node.className == className) { + return true; + } + var reg = new RegExp('(^| )'+ className +'($| )') + if (reg.test(node.className)) { + return true; + } + return false; +} + +/** + * Adds a class name to an element + */ +function addClass(node, className) { + if (hasClass(node, className)) { + return false; + } + node.className += ' '+ className; + return true; +} + +/** + * Removes a class name from an element + */ +function removeClass(node, className) { + if (!hasClass(node, className)) { + return false; + } + // Replaces words surrounded with whitespace or at a string border with a space. Prevents multiple class names from being glued together. + node.className = eregReplace('(^|\\s+)'+ className +'($|\\s+)', ' ', node.className); + return true; +} + +/** + * Toggles a class name on or off for an element + */ +function toggleClass(node, className) { + if (!removeClass(node, className) && !addClass(node, className)) { + return false; + } + return true; +} + +/** + * Emulate PHP's ereg_replace function in javascript + */ +function eregReplace(search, replace, subject) { + return subject.replace(new RegExp(search,'g'), replace); +} + +/** + * Removes an element from the page + */ +function removeNode(node) { + if (typeof node == 'string') { + node = $(node); + } + if (node && node.parentNode) { + return node.parentNode.removeChild(node); + } + else { + return false; + } +} + +/** + * Prevents an event from propagating. + */ +function stopEvent(event) { + if (event.preventDefault) { + event.preventDefault(); + event.stopPropagation(); + } + else { + event.returnValue = false; + event.cancelBubble = true; + } +} + +/** + * Parse a JSON response. + * + * The result is either the JSON object, or an object with 'status' 0 and 'data' an error message. + */ +function parseJson(data) { + if (data.substring(0,1) != '{') { + return { status: 0, data: data.length ? data : 'Unspecified error' }; + } + return eval('(' + data + ');'); +} + +/** + * Create an invisible iframe for form submissions. + */ +function createIframe() { + // Delete any previous iframe + deleteIframe(); + // Note: some browsers require the literal name/id attributes on the tag, + // some want them set through JS. We do both. + window.iframeHandler = function () {}; + var div = document.createElement('div'); + div.id = 'redirect-holder'; + div.innerHTML = ''; + var iframe = div.firstChild; + with (iframe) { + name = 'redirect-target'; + setAttribute('name', 'redirect-target'); + id = 'redirect-target'; + } + with (iframe.style) { + position = 'absolute'; + height = '1px'; + width = '1px'; + visibility = 'hidden'; + } + document.body.appendChild(div); +} + +/** + * Delete the invisible iframe for form submissions. + */ +function deleteIframe() { + var holder = $('redirect-holder'); + if (holder != null) { + removeNode(holder); + } +} + +/** + * Wrapper around document.getElementById(). + */ +function $(id) { + return document.getElementById(id); +} diff --git a/misc/druplicon.png b/misc/druplicon.png new file mode 100644 index 0000000..6a77038 Binary files /dev/null and b/misc/druplicon.png differ diff --git a/misc/favicon.ico b/misc/favicon.ico new file mode 100644 index 0000000..18e2d52 Binary files /dev/null and b/misc/favicon.ico differ diff --git a/misc/feed.png b/misc/feed.png new file mode 100644 index 0000000..1679ab0 Binary files /dev/null and b/misc/feed.png differ diff --git a/misc/forum-closed.png b/misc/forum-closed.png new file mode 100644 index 0000000..e7b6f5e Binary files /dev/null and b/misc/forum-closed.png differ diff --git a/misc/forum-default.png b/misc/forum-default.png new file mode 100644 index 0000000..b3d9cad Binary files /dev/null and b/misc/forum-default.png differ diff --git a/misc/forum-hot-new.png b/misc/forum-hot-new.png new file mode 100644 index 0000000..bae2d5c Binary files /dev/null and b/misc/forum-hot-new.png differ diff --git a/misc/forum-hot.png b/misc/forum-hot.png new file mode 100644 index 0000000..e3c1a74 Binary files /dev/null and b/misc/forum-hot.png differ diff --git a/misc/forum-new.png b/misc/forum-new.png new file mode 100644 index 0000000..9539c39 Binary files /dev/null and b/misc/forum-new.png differ diff --git a/misc/forum-sticky.png b/misc/forum-sticky.png new file mode 100644 index 0000000..fe96423 Binary files /dev/null and b/misc/forum-sticky.png differ diff --git a/misc/google-pl1.png b/misc/google-pl1.png new file mode 100644 index 0000000..ffd3da4 Binary files /dev/null and b/misc/google-pl1.png differ diff --git a/misc/google-plc.png b/misc/google-plc.png new file mode 100644 index 0000000..fe1563d Binary files /dev/null and b/misc/google-plc.png differ diff --git a/misc/google-ple.png b/misc/google-ple.png new file mode 100644 index 0000000..c5e5da0 Binary files /dev/null and b/misc/google-ple.png differ diff --git a/misc/googlemap-notes.txt b/misc/googlemap-notes.txt new file mode 100644 index 0000000..2768aa6 --- /dev/null +++ b/misc/googlemap-notes.txt @@ -0,0 +1,29 @@ +==== packaged stuff, either in plcwww or myplc : + +* wrote /var/www/html/misc/googlemap.js +-> has initial center & zoom hardcoded, as well as the clip window + +* updated plc-map.py to generate /var/www/html/sites/plc-sites.js +-> this is a js file that contains (unclipped) sites description + +* added two icons in misc/ named google-plc.png and google-ple.png +-> in need for better names some day + +==== on planet-lab.eu + +* defined a new input format that supports both php and textile - + order does not seem important + +* gave up the idea of showing the googlemap on the main page -- too slow +* hacked googlemap.js to clip/filter-out non-EU sites to speed up, still too slow +* so went for creating a separate page that can be accessed for the right menu as 'Map' + +* used that new input format (could have used php directly in fact since it's on its own now) + +* in this page : +- uses php's drupal_set_html_head to download google api with related key +- uses php's drupal_add_js to insert sites/plc-sites.js +- uses php's drupal_add_js to insert misc/googlemap.js +- and quotes the
      thing + +and that's about it diff --git a/misc/googlemap.js b/misc/googlemap.js new file mode 100644 index 0000000..138cf74 --- /dev/null +++ b/misc/googlemap.js @@ -0,0 +1,94 @@ +/* + * performs the equivalent of + * needs the allSites global var that is suppoesd to have been defined + * in /var/www/html/sites/plc-sites.js by plc-map.py + */ + +window.onDomReady = DomReady; + +//Setup the event +function DomReady(fn) { + //W3C + if(document.addEventListener) { + document.addEventListener("DOMContentLoaded", fn, false); + } else { + //IE + document.onreadystatechange = function(){readyState(fn)} + } +} + +//IE execute function +function readyState(fn) { + // Thierry: initial version from the internet read + // if(document.readyState == "interactive") + // I have noticed that + // (*) on first load, I was hitting this point only once with complete + // (*) on reload I get here twice with "interactive" and then "complete" + // so as a quick'n dirty way : + if(document.readyState == "complete") { + fn(); + } +} + +window.onDomReady(create_map); + +/* initial center */ +centerLat=52; +centerLon=15; +/* initial zoom level */ +initZoom=4; + +function decode_utf8( s ) +{ + return decodeURIComponent( escape( s ) ); +} + +function create_marker (map, point, site) { + var marker=new GMarker(point); + var html='' + decode_utf8(site.name) + '\n'; + html += '
      ' + site.nb_nodes + ' Nodes\n'; + if (site.peername) { + html += '
      ' + decode_utf8(site.peername) + '\n'; + } + /* display site name with url on info window - triggers on click */ + GEvent.addListener(marker, 'click', function() {marker.openInfoWindowHtml(html);}); + /* double click - clear info window */ + GEvent.addListener(marker, 'dblclick', function() {marker.closeInfoWindow();}); + /* required before setImage can be called */ + map.addOverlay(marker); + /* set different layouts for local/foreign */ + /* google originals are in http://maps.google.com/mapfiles/ms/icons/blue-dot.png or blue.png or ... */ + if (!site.peername) { + /* local */ + marker.setImage('/misc/google-ple.png'); + } else { + marker.setImage('/misc/google-plc.png'); + } + return marker; +} + +function create_map() { + if (GBrowserIsCompatible()) { + var map = new GMap2(document.getElementById("googlemap")); + map.setCenter(new GLatLng(centerLat, centerLon), initZoom); + map.addControl(new GLargeMapControl()); + map.addControl(new GMapTypeControl()); + map.addControl(new GOverviewMapControl()); + /*var geocoder = new GClientGeocoder();*/ + map.setMapType(G_SATELLITE_MAP); + + + for (i=0;i 
      '+ + '
      '; +} + +/** + * Set the percentage and status message for the progressbar. + */ +progressBar.prototype.setProgress = function (percentage, message) { + var divs = this.element.getElementsByTagName('div'); + var div; + for (var i = 0; div = divs[i]; ++i) { + if (percentage >= 0) { + if (hasClass(divs[i], 'filled')) { + divs[i].style.width = percentage + '%'; + } + if (hasClass(divs[i], 'percentage')) { + divs[i].innerHTML = percentage + '%'; + } + } + if (hasClass(divs[i], 'message')) { + divs[i].innerHTML = message; + } + } + if (this.updateCallback) { + this.updateCallback(percentage, message, this); + } +} + +/** + * Start monitoring progress via Ajax. + */ +progressBar.prototype.startMonitoring = function (uri, delay) { + this.delay = delay; + this.uri = uri; + this.sendPing(); +} + +/** + * Stop monitoring progress via Ajax. + */ +progressBar.prototype.stopMonitoring = function () { + clearTimeout(this.timer); + // This allows monitoring to be stopped from within the callback + this.uri = null; +} + +/** + * Request progress data from server. + */ +progressBar.prototype.sendPing = function () { + if (this.timer) { + clearTimeout(this.timer); + } + if (this.uri) { + this.method(this.uri, this.receivePing, this, ''); + } +} + +/** + * HTTP callback function. Passes data back to the progressbar and sets a new + * timer for the next ping. + */ +progressBar.prototype.receivePing = function (string, xmlhttp, pb) { + if (xmlhttp.status != 200) { + return pb.displayError('An HTTP error '+ xmlhttp.status +' occured.\n'+ pb.uri); + } + // Parse response + var progress = parseJson(string); + // Display errors + if (progress.status == 0) { + pb.displayError(progress.data); + return; + } + + // Update display + pb.setProgress(progress.percentage, progress.message); + // Schedule next timer + pb.timer = setTimeout(function() { pb.sendPing(); }, pb.delay); +} + +/** + * Display errors on the page. + */ +progressBar.prototype.displayError = function (string) { + var error = document.createElement('div'); + error.className = 'error'; + error.innerHTML = string; + + this.element.style.display = 'none'; + this.element.parentNode.insertBefore(error, this.element); + + if (this.errorCallback) { + this.errorCallback(this); + } +} diff --git a/misc/textarea.js b/misc/textarea.js new file mode 100644 index 0000000..03b0d61 --- /dev/null +++ b/misc/textarea.js @@ -0,0 +1,122 @@ +// $Id: textarea.js 144 2007-03-28 07:52:20Z thierry $ + +if (isJsEnabled()) { + addLoadEvent(textAreaAutoAttach); +} + +function textAreaAutoAttach(event, parent) { + if (typeof parent == 'undefined') { + // Attach to all visible textareas. + textareas = document.getElementsByTagName('textarea'); + } + else { + // Attach to all visible textareas inside parent. + textareas = parent.getElementsByTagName('textarea'); + } + var textarea; + for (var i = 0; textarea = textareas[i]; ++i) { + if (hasClass(textarea, 'resizable') && !hasClass(textarea.nextSibling, 'grippie')) { + if (typeof dimensions(textarea).width != 'undefined' && dimensions(textarea).width != 0) { + new textArea(textarea); + } + } + } +} + +function textArea(element) { + var ta = this; + this.element = element; + this.parent = this.element.parentNode; + this.dimensions = dimensions(element); + + // Prepare wrapper + this.wrapper = document.createElement('div'); + this.wrapper.className = 'resizable-textarea'; + this.parent.insertBefore(this.wrapper, this.element); + + // Add grippie and measure it + this.grippie = document.createElement('div'); + this.grippie.className = 'grippie'; + this.wrapper.appendChild(this.grippie); + this.grippie.dimensions = dimensions(this.grippie); + this.grippie.onmousedown = function (e) { ta.beginDrag(e); }; + + // Set wrapper and textarea dimensions + this.wrapper.style.height = this.dimensions.height + this.grippie.dimensions.height + 1 +'px'; + this.element.style.marginBottom = '0px'; + this.element.style.width = '100%'; + this.element.style.height = this.dimensions.height +'px'; + + // Wrap textarea + removeNode(this.element); + this.wrapper.insertBefore(this.element, this.grippie); + + // Measure difference between desired and actual textarea dimensions to account for padding/borders + this.widthOffset = dimensions(this.wrapper).width - this.dimensions.width; + + // Make the grippie line up in various browsers + if (window.opera) { + // Opera + this.grippie.style.marginRight = '4px'; + } + if (document.all && !window.opera) { + // IE + this.grippie.style.width = '100%'; + this.grippie.style.paddingLeft = '2px'; + } + // Mozilla + this.element.style.MozBoxSizing = 'border-box'; + + this.heightOffset = absolutePosition(this.grippie).y - absolutePosition(this.element).y - this.dimensions.height; +} + +textArea.prototype.beginDrag = function (event) { + if (document.isDragging) { + return; + } + document.isDragging = true; + + event = event || window.event; + // Capture mouse + var cp = this; + this.oldMoveHandler = document.onmousemove; + document.onmousemove = function(e) { cp.handleDrag(e); }; + this.oldUpHandler = document.onmouseup; + document.onmouseup = function(e) { cp.endDrag(e); }; + + // Store drag offset from grippie top + var pos = absolutePosition(this.grippie); + this.dragOffset = event.clientY - pos.y; + + // Make transparent + this.element.style.opacity = 0.5; + + // Process + this.handleDrag(event); +} + +textArea.prototype.handleDrag = function (event) { + event = event || window.event; + // Get coordinates relative to text area + var pos = absolutePosition(this.element); + var y = event.clientY - pos.y; + + // Set new height + var height = Math.max(32, y - this.dragOffset - this.heightOffset); + this.wrapper.style.height = height + this.grippie.dimensions.height + 1 + 'px'; + this.element.style.height = height + 'px'; + + // Avoid text selection + stopEvent(event); +} + +textArea.prototype.endDrag = function (event) { + // Uncapture mouse + document.onmousemove = this.oldMoveHandler; + document.onmouseup = this.oldUpHandler; + + // Restore opacity + this.element.style.opacity = 1.0; + document.isDragging = false; +} + diff --git a/misc/throbber.gif b/misc/throbber.gif new file mode 100644 index 0000000..4352e64 Binary files /dev/null and b/misc/throbber.gif differ diff --git a/misc/update.js b/misc/update.js new file mode 100644 index 0000000..5123bb4 --- /dev/null +++ b/misc/update.js @@ -0,0 +1,33 @@ +// $Id: update.js 144 2007-03-28 07:52:20Z thierry $ + +if (isJsEnabled()) { + addLoadEvent(function() { + if ($('edit-has_js')) { + $('edit-has_js').value = 1; + } + + if ($('progress')) { + // Success: redirect to the summary. + var updateCallback = function (progress, status, pb) { + if (progress == 100) { + pb.stopMonitoring(); + window.location = window.location.href.split('op=')[0] +'op=finished'; + } + } + + // Failure: point out error message and provide link to the summary. + var errorCallback = function (pb) { + var div = document.createElement('p'); + div.className = 'error'; + div.innerHTML = 'An unrecoverable error has occured. You can find the error message below. It is advised to copy it to the clipboard for reference. Please continue to the update summary'; + $('progress').insertBefore(div, $('progress').firstChild); + $('wait').style.display = 'none'; + } + + var progress = new progressBar('updateprogress', updateCallback, HTTPPost, errorCallback); + progress.setProgress(-1, 'Starting updates'); + $('progress').appendChild(progress.element); + progress.startMonitoring('update.php?op=do_update', 0); + } + }); +} diff --git a/misc/upload.js b/misc/upload.js new file mode 100644 index 0000000..aa07f70 --- /dev/null +++ b/misc/upload.js @@ -0,0 +1,75 @@ +// $Id: upload.js 144 2007-03-28 07:52:20Z thierry $ + +// Global killswitch +if (isJsEnabled()) { + addLoadEvent(uploadAutoAttach); +} + +/** + * Attaches the upload behaviour to the upload form. + */ +function uploadAutoAttach() { + var inputs = document.getElementsByTagName('input'); + for (i = 0; input = inputs[i]; i++) { + if (input && hasClass(input, 'upload')) { + var uri = input.value; + // Extract the button ID based on a substring of the input name: edit[foo][bar] -> foo-bar + var button = input.name.substr(5, input.name.length - 6).replace('][', '-'); + var wrapper = button + '-wrapper'; + var hide = button + '-hide'; + var upload = new jsUpload(uri, button, wrapper, hide); + } + } +} + +/** + * JS upload object. + */ +function jsUpload(uri, button, wrapper, hide) { + this.button = button; + this.wrapper = wrapper; + this.hide = hide; + redirectFormButton(uri, $(button), this); +} + +/** + * Handler for the form redirection submission. + */ +jsUpload.prototype.onsubmit = function () { + var hide = $(this.hide); + // Insert progressbar and stretch to take the same space. + this.progress = new progressBar('uploadprogress'); + this.progress.setProgress(-1, 'Uploading file'); + this.progress.element.style.width = '28em'; + this.progress.element.style.height = hide.offsetHeight +'px'; + hide.parentNode.insertBefore(this.progress.element, hide); + // Hide file form (cannot use display: none, this mysteriously aborts form + // submission in Konqueror) + hide.style.position = 'absolute'; + hide.style.left = '-2000px'; +} + +/** + * Handler for the form redirection completion. + */ +jsUpload.prototype.oncomplete = function (data) { + // Remove progressbar + removeNode(this.progress.element); + this.progress = null; + // Replace form and re-attach behaviour + $(this.wrapper).innerHTML = data; + uploadAutoAttach(); +} + +/** + * Handler for the form redirection error. + */ +jsUpload.prototype.onerror = function (error) { + alert('An error occurred:\n\n'+ error); + // Remove progressbar + removeNode(this.progress.element); + this.progress = null; + // Undo hide + $(this.hide).style.position = 'static'; + $(this.hide).style.left = '0px'; +} diff --git a/misc/watchdog-error.png b/misc/watchdog-error.png new file mode 100644 index 0000000..e2ed440 Binary files /dev/null and b/misc/watchdog-error.png differ diff --git a/misc/watchdog-warning.png b/misc/watchdog-warning.png new file mode 100644 index 0000000..816ded5 Binary files /dev/null and b/misc/watchdog-warning.png differ diff --git a/misc/xml.png b/misc/xml.png new file mode 100644 index 0000000..a7cc689 Binary files /dev/null and b/misc/xml.png differ diff --git a/modules/aggregator.module b/modules/aggregator.module new file mode 100644 index 0000000..bb466b2 --- /dev/null +++ b/modules/aggregator.module @@ -0,0 +1,1371 @@ +'. t('The news aggregator is a powerful on-site RSS syndicator/news reader that can gather fresh content from news sites and weblogs around the web.') .'

      '; + $output .= '

      '. t('Users can view the latest news chronologically in the main news aggregator display or by source. Administrators can add, edit and delete feeds and choose how often to check for newly updated news for each individual feed. Administrators can also tag individual feeds with categories, offering selective grouping of some feeds into separate displays. Listings of the latest news for individual sources or categorized sources can be enabled as blocks for display in the sidebar through the block administration page. The news aggregator requires cron to check for the latest news from the sites to which you have subscribed. Drupal also provides a machine-readable OPML file of all of your subscribed feeds.', array('%aggregator' => url('aggregator'), '%aggregator-sources' => url('aggregator/sources'), '%admin-block' => url('admin/block'), '%aggregator-opml' => url('aggregator/opml'))) .'

      '; + $output .= t('

      You can

      + +', array('%admin-aggregator' => url('admin/aggregator'), '%admin-aggregator-add-feed' => url('admin/aggregator/add/feed'), '%admin-aggregator-add-category' => url('admin/aggregator/add/category'), '%admin-settings-aggregator' => url('admin/settings/aggregator'), '%admin-access' => url('admin/access'), '%aggregator' => url('aggregator'))); + $output .= '

      '. t('For more information please read the configuration and customization handbook Aggregator page.', array('%aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'

      '; + return $output; + case 'admin/modules#description': + return t('Aggregates syndicated content (RSS, RDF, and Atom feeds).'); + case 'admin/aggregator': + return t('

      Thousands of sites (particularly news sites and weblogs) publish their latest headlines and/or stories in a machine-readable format so that other sites can easily link to them. This content is usually in the form of an RSS feed (which is an XML-based syndication standard). To display the feed or category in a block you must decide how many items to show by editing the feed or block and turning on the feed\'s block.

      ', array('%block' => url('admin/block'))); + case 'admin/aggregator/add/feed': + return t('

      Add a site that has an RSS/RDF/Atom feed. The URL is the full path to the feed file. For the feed to update automatically you must run "cron.php" on a regular basis. If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.

      '); + case 'admin/aggregator/add/category': + return t('

      Categories provide a way to group items from different news feeds together. Each news category has its own feed page and block. For example, you could tag various sport-related feeds as belonging to a category called Sports. News items can be added to a category automatically by setting a feed to automatically place its item into that category, or by using the categorize items link in any listing of news items.

      '); + } +} + +/** + * Implementation of hook_menu(). + */ +function aggregator_menu($may_cache) { + $items = array(); + $edit = user_access('administer news feeds'); + $view = user_access('access news feeds'); + + if ($may_cache) { + $items[] = array('path' => 'admin/aggregator', + 'title' => t('aggregator'), + 'callback' => 'aggregator_admin_overview', + 'access' => $edit); + $items[] = array('path' => 'admin/aggregator/add/feed', + 'title' => t('add feed'), + 'callback' => 'aggregator_form_feed', + 'access' => $edit, + 'type' => MENU_LOCAL_TASK); + $items[] = array('path' => 'admin/aggregator/add/category', + 'title' => t('add category'), + 'callback' => 'aggregator_form_category', + 'access' => $edit, + 'type' => MENU_LOCAL_TASK); + $items[] = array('path' => 'admin/aggregator/remove', + 'title' => t('remove items'), + 'callback' => 'aggregator_admin_remove_feed', + 'access' => $edit, + 'type' => MENU_CALLBACK); + $items[] = array('path' => 'admin/aggregator/update', + 'title' => t('update items'), + 'callback' => 'aggregator_admin_refresh_feed', + 'access' => $edit, + 'type' => MENU_CALLBACK); + $items[] = array('path' => 'admin/aggregator/list', + 'title' => t('list'), + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10); + + $items[] = array('path' => 'aggregator', + 'title' => t('news aggregator'), + 'callback' => 'aggregator_page_last', + 'access' => $view, + 'weight' => 5); + $items[] = array('path' => 'aggregator/sources', + 'title' => t('sources'), + 'callback' => 'aggregator_page_sources', + 'access' => $view); + $items[] = array('path' => 'aggregator/categories', + 'title' => t('categories'), + 'callback' => 'aggregator_page_categories', + 'access' => $view, + 'type' => MENU_ITEM_GROUPING); + $items[] = array('path' => 'aggregator/rss', + 'title' => t('RSS feed'), + 'callback' => 'aggregator_page_rss', + 'access' => $view, + 'type' => MENU_CALLBACK); + $items[] = array('path' => 'aggregator/opml', + 'title' => t('OPML feed'), + 'callback' => 'aggregator_page_opml', + 'access' => $view, + 'type' => MENU_CALLBACK); + + $result = db_query('SELECT title, cid FROM {aggregator_category} ORDER BY title'); + while ($category = db_fetch_array($result)) { + $items[] = array('path' => 'aggregator/categories/'. $category['cid'], + 'title' => $category['title'], + 'callback' => 'aggregator_page_category', + 'access' => $view); + } + } + else { + if (arg(0) == 'aggregator' && is_numeric(arg(2))) { + if (arg(1) == 'sources') { + $feed = aggregator_get_feed(arg(2)); + if ($feed) { + $items[] = array('path' => 'aggregator/sources/'. $feed['fid'], + 'title' => $feed['title'], + 'callback' => 'aggregator_page_source', + 'access' => $view, + 'type' => MENU_CALLBACK); + $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/view', + 'title' => t('view'), + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10); + $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/categorize', + 'title' => t('categorize'), + 'callback' => 'aggregator_page_source', + 'access' => $edit, + 'type' => MENU_LOCAL_TASK); + $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/configure', + 'title' => t('configure'), + 'callback' => 'aggregator_form_feed', + 'callback arguments' => array($feed), + 'access' => $edit, + 'type' => MENU_LOCAL_TASK, + 'weight' => 1); + } + } + else if (arg(1) == 'categories') { + $category = aggregator_get_category(arg(2)); + if ($category) { + $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/view', + 'title' => t('view'), + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10); + $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/categorize', + 'title' => t('categorize'), + 'callback' => 'aggregator_page_category', + 'access' => $edit, + 'type' => MENU_LOCAL_TASK); + $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/configure', + 'title' => t('configure'), + 'callback' => 'aggregator_form_category', + 'callback arguments' => array($category), + 'access' => $edit, + 'type' => MENU_LOCAL_TASK, + 'weight' => 1); + } + } + } + else if (arg(1) == 'aggregator' && is_numeric(arg(4))) { + if (arg(3) == 'feed') { + $feed = aggregator_get_feed(arg(4)); + if ($feed) { + $items[] = array('path' => 'admin/aggregator/edit/feed/'. $feed['fid'], + 'title' => t('edit feed'), + 'callback' => 'aggregator_form_feed', + 'callback arguments' => array($feed), + 'access' => $edit, + 'type' => MENU_CALLBACK); + } + } + else { + $category = aggregator_get_category(arg(4)); + if ($category) { + $items[] = array('path' => 'admin/aggregator/edit/category/'. $category['cid'], + 'title' => t('edit category'), + 'callback' => 'aggregator_form_category', + 'callback arguments' => array($category), + 'access' => $edit, + 'type' => MENU_CALLBACK); + } + } + } + } + + return $items; +} + +/** + * Implementation of hook_settings(). + */ +function aggregator_settings() { + $items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items'); + $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'); + + $form['aggregator_allowed_html_tags'] = array( + '#type' => 'textfield', '#title' => t('Allowed HTML tags'), '#size' => 80, '#maxlength' => 255, + '#default_value' => variable_get('aggregator_allowed_html_tags', '

        • '), + '#description' => t('The list of tags which are allowed in feeds, i.e., which will not be removed by Drupal.') + ); + + $form['aggregator_summary_items'] = array( + '#type' => 'select', '#title' => t('Items shown in sources and categories pages') , + '#default_value' => variable_get('aggregator_summary_items', 3), '#options' => $items, + '#description' => t('The number of items which will be shown with each feed or category in the feed and category summary pages.') + ); + + $form['aggregator_clear'] = array( + '#type' => 'select', '#title' => t('Discard news items older than'), + '#default_value' => variable_get('aggregator_clear', 9676800), '#options' => $period, + '#description' => t('Older news items will be automatically discarded. Requires crontab.') + ); + + $form['aggregator_category_selector'] = array( + '#type' => 'radios', '#title' => t('Category selection type'), '#default_value' => variable_get('aggregator_category_selector', 'check'), + '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')), + '#description' => t('The type of category selection widget which is shown on categorization pages. Checkboxes are easier to use; a multiple selector is good for working with large numbers of categories.') + ); + return $form; +} + +/** + * Implementation of hook_perm(). + */ +function aggregator_perm() { + return array('administer news feeds', 'access news feeds'); +} + +/** + * Implementation of hook_cron(). + * + * Checks news feeds for updates once their refresh interval has elapsed. + */ +function aggregator_cron() { + $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < %d', time()); + while ($feed = db_fetch_array($result)) { + aggregator_refresh($feed); + } +} + +/** + * Implementation of hook_block(). + * + * Generates blocks for the latest news items in each category and feed. + */ +function aggregator_block($op, $delta = 0, $edit = array()) { + if (user_access('access news feeds')) { + if ($op == 'list') { + $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title'); + while ($category = db_fetch_object($result)) { + $block['category-'. $category->cid]['info'] = t('%title category latest items', array('%title' => theme('placeholder', $category->title))); + } + $result = db_query('SELECT fid, title FROM {aggregator_feed} ORDER BY fid'); + while ($feed = db_fetch_object($result)) { + $block['feed-'. $feed->fid]['info'] = t('%title feed latest items', array('%title' => theme('placeholder', $feed->title))); + } + } + else if ($op == 'configure') { + list($type, $id) = explode('-', $delta); + if ($type == 'category') { + $value = db_result(db_query('SELECT block FROM {aggregator_category} WHERE cid = %d', $id)); + } + else { + $value = db_result(db_query('SELECT block FROM {aggregator_feed} WHERE fid = %d', $id)); + } + $form['block'] = array('#type' => 'select', '#title' => t('Number of news items in block'), '#default_value' => $value, '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20))); + return $form; + } + else if ($op == 'save') { + list($type, $id) = explode('-', $delta); + if ($type == 'category') { + $value = db_query('UPDATE {aggregator_category} SET block = %d WHERE cid = %d', $edit['block'], $id); + } + else { + $value = db_query('UPDATE {aggregator_feed} SET block = %d WHERE fid = %d', $edit['block'], $id); + } + } + else if ($op == 'view') { + list($type, $id) = explode('-', $delta); + switch ($type) { + case 'feed': + if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE fid = %d', $id))) { + $block['subject'] = check_plain($feed->title); + $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block); + $block['content'] = '
          '. l(t('more'), 'aggregator/sources/'. $feed->fid, array('title' => t('View this feed\'s recent news.'))) .'
          '; + } + break; + + case 'category': + if ($category = db_fetch_object(db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = %d', $id))) { + $block['subject'] = check_plain($category->title); + $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = %d ORDER BY i.timestamp DESC, i.iid DESC', $category->cid, 0, $category->block); + $block['content'] = '
          '. l(t('more'), 'aggregator/categories/'. $category->cid, array('title' => t('View this category\'s recent news.'))) .'
          '; + } + break; + } + $items = array(); + while ($item = db_fetch_object($result)) { + $items[] = theme('aggregator_block_item', $item); + } + $block['content'] = theme('item_list', $items) . $block['content']; + } + return $block; + } +} + +/** + * Generate a form to add/edit/delete aggregator categories. + */ + function aggregator_form_category($edit = array()) { + $form['title'] = array('#type' => 'textfield', + '#title' => t('Title'), + '#default_value' => $edit['title'], + '#maxlength' => 64, + '#required' => TRUE, + ); + $form['description'] = array('#type' => 'textarea', + '#title' => t('Description'), + '#default_value' => $edit['description'], + ); + $form['submit'] = array('#type' => 'submit', '#value' =>t('Submit')); + + if ($edit['cid']) { + $form['delete'] = array('#type' => 'submit', '#value' =>t('Delete')); + $form['cid'] = array('#type' => 'hidden', '#value' => $edit['cid']); + } + + return drupal_get_form('aggregator_form_category', $form); +} + +/** + * Validate aggregator_form_feed form submissions. + */ +function aggregator_form_category_validate($form_id, $form_values) { + if ($_POST['op'] == t('Submit')) { + // Check for duplicate titles + if (isset($form_values['cid'])) { + $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s' AND cid != %d", $form_values['title'], $form_values['cid'])); + } + else { + $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s'", $form_values['title'])); + } + if ($category) { + form_set_error('title', t('A category named %category already exists. Please enter a unique title.', array('%category' => theme('placeholder', $form_values['title'])))); + } + } +} + +/** + * Process aggregator_form_category form submissions. + * @todo Add delete confirmation dialog. + */ +function aggregator_form_category_submit($form_id, $form_values) { + if ($_POST['op'] == t('Delete')) { + $title = $form_values['title']; + // Unset the title: + unset($form_values['title']); + } + aggregator_save_category($form_values); + menu_rebuild(); + if (isset($form_values['cid'])) { + if (isset($form_values['title'])) { + drupal_set_message(t('The category %category has been updated.', array('%category' => theme('placeholder', $form_values['title'])))); + if (arg(0) == 'admin') { + return 'admin/aggregator/'; + } + else { + return 'aggregator/categories/'. $form_values['cid']; + } + } + else { + watchdog('aggregator', t('Category %category deleted.', array('%category' => theme('placeholder', $title)))); + drupal_set_message(t('The category %category has been deleted.', array('%category' => theme('placeholder', $title)))); + if (arg(0) == 'admin') { + return 'admin/aggregator/'; + } + else { + return 'aggregator/categories/'; + } + } + } + else { + watchdog('aggregator', t('Category %category added.', array('%category' => theme('placeholder', $form_values['title']))), WATCHDOG_NOTICE, l(t('view'), 'admin/aggregator')); + drupal_set_message(t('The category %category has been added.', array('%category' => theme('placeholder', $form_values['title'])))); + } +} + +/** + * Add/edit/delete aggregator categories. + */ +function aggregator_save_category($edit) { + if ($edit['cid'] && $edit['title']) { + db_query("UPDATE {aggregator_category} SET title = '%s', description = '%s' WHERE cid = %d", $edit['title'], $edit['description'], $edit['cid']); + } + else if ($edit['cid']) { + db_query('DELETE FROM {aggregator_category} WHERE cid = %d', $edit['cid']); + } + else if ($edit['title']) { + // A single unique id for bundles and feeds, to use in blocks + $next_id = db_next_id('{aggregator_category}_cid'); + db_query("INSERT INTO {aggregator_category} (cid, title, description, block) VALUES (%d, '%s', '%s', 5)", $next_id, $edit['title'], $edit['description']); + } +} + +/** + * Generate a form to add/edit feed sources. + */ +function aggregator_form_feed($edit = array()) { + $period = drupal_map_assoc(array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval'); + + if ($edit['refresh'] == '') { + $edit['refresh'] = 3600; + } + + $form['title'] = array('#type' => 'textfield', + '#title' => t('Title'), + '#default_value' => $edit['title'], + '#maxlength' => 64, + '#description' => t('The name of the feed; typically the name of the web site you syndicate content from.'), + '#required' => TRUE, + ); + $form['url'] = array('#type' => 'textfield', + '#title' => t('URL'), + '#default_value' => $edit['url'], + '#maxlength' => 255, + '#description' => t('The fully-qualified URL of the feed.'), + '#required' => TRUE, + ); + $form['refresh'] = array('#type' => 'select', + '#title' => t('Update interval'), + '#default_value' => $edit['refresh'], + '#options' => $period, + '#description' => t('The refresh interval indicating how often you want to update this feed. Requires crontab.'), + ); + + // Handling of categories: + $options = array(); + $values = array(); + $categories = db_query('SELECT c.cid, c.title, f.fid FROM {aggregator_category} c LEFT JOIN {aggregator_category_feed} f ON c.cid = f.cid AND f.fid = %d ORDER BY title', $edit['fid']); + while ($category = db_fetch_object($categories)) { + $options[$category->cid] = $category->title; + if ($category->fid) $values[] = check_plain($category->cid); + } + if ($options) { + $form['category'] = array('#type' => 'checkboxes', + '#title' => t('Categorize news items'), + '#default_value' => $values, + '#options' => $options, + '#description' => t('New items in this feed will be automatically filed in the checked categories as they are received.'), + ); + } + $form['submit'] = array('#type' => 'submit', '#value' =>t('Submit')); + + if ($edit['fid']) { + $form['delete'] = array('#type' => 'submit', '#value' =>t('Delete')); + $form['fid'] = array('#type' => 'hidden', '#value' => $edit['fid']); + } + + return drupal_get_form('aggregator_form_feed', $form); +} + +/** + * Validate aggregator_form_feed form submissions. + */ +function aggregator_form_feed_validate($form_id, $form_values) { + if ($_POST['op'] == t('Submit')) { + // Check for duplicate titles + if (isset($form_values['fid'])) { + $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = '%s' OR url='%s') AND fid != %d", $form_values['title'], $form_values['url'], $form_values['fid']); + } + else { + $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url='%s'", $form_values['title'], $form_values['url']); + } + while ($feed = db_fetch_object($result)) { + if (strcasecmp($feed->title, $form_values['title']) == 0) { + form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => theme('placeholder', $form_values['title'])))); + } + } + } +} + +/** + * Process aggregator_form_feed form submissions. + * @todo Add delete confirmation dialog. + */ +function aggregator_form_feed_submit($form_id, $form_values) { + if ($_POST['op'] == t('Delete')) { + $title = $form_values['title']; + // Unset the title: + unset($form_values['title']); + } + aggregator_save_feed($form_values); + menu_rebuild(); + if (isset($form_values['fid'])) { + if (isset($form_values['title'])) { + drupal_set_message(t('The feed %feed has been updated.', array('%feed' => theme('placeholder', $form_values['title'])))); + if (arg(0) == 'admin') { + return 'admin/aggregator/'; + } + else { + return 'aggregator/sources/'. $form_values['fid']; + } + } + else { + watchdog('aggregator', t('Feed %feed deleted.', array('%feed' => theme('placeholder', $title)))); + drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => theme('placeholder', $title)))); + if (arg(0) == 'admin') { + return 'admin/aggregator/'; + } + else { + return 'aggregator/sources/'; + } + } + } + else { + watchdog('aggregator', t('Feed %feed added.', array('%feed' => theme('placeholder', $form_values['title']))), WATCHDOG_NOTICE, l(t('view'), 'admin/aggregator')); + drupal_set_message(t('The feed %feed has been added.', array('%feed' => theme('placeholder', $form_values['title'])))); + } +} + +/** + * Add/edit/delete an aggregator feed. + */ +function aggregator_save_feed($edit) { + if ($edit['fid']) { + // An existing feed is being modified, delete the category listings. + db_query('DELETE FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']); + } + if ($edit['fid'] && $edit['title']) { + db_query("UPDATE {aggregator_feed} SET title = '%s', url = '%s', refresh = %d WHERE fid = %d", $edit['title'], $edit['url'], $edit['refresh'], $edit['fid']); + } + else if ($edit['fid']) { + $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d', $edit['fid']); + while ($item = db_fetch_object($result)) { + $items[] = "iid = $item->iid"; + } + if ($items) { + db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items)); + } + db_query('DELETE FROM {aggregator_feed} WHERE fid = %d', $edit['fid']); + db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $edit['fid']); + } + else if ($edit['title']) { + // A single unique id for bundles and feeds, to use in blocks. + $edit['fid'] = db_next_id('{aggregator_feed}_fid'); + db_query("INSERT INTO {aggregator_feed} (fid, title, url, refresh, block) VALUES (%d, '%s', '%s', %d, 5)", $edit['fid'], $edit['title'], $edit['url'], $edit['refresh']); + } + if ($edit['title']) { + // The feed is being saved, save the categories as well. + if ($edit['category']) { + foreach ($edit['category'] as $cid => $value) { + if ($value) { + db_query('INSERT INTO {aggregator_category_feed} (fid, cid) VALUES (%d, %d)', $edit['fid'], $cid); + } + } + } + } +} + +function aggregator_remove($feed) { + $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d', $feed['fid']); + while ($item = db_fetch_object($result)) { + $items[] = "iid = $item->iid"; + } + if ($items) { + db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items)); + } + db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $feed['fid']); + db_query("UPDATE {aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d", $feed['fid']); + drupal_set_message(t('The news items from %site have been removed.', array('%site' => theme('placeholder', $feed['title'])))); +} + +/** + * Call-back function used by the XML parser. + */ +function aggregator_element_start($parser, $name, $attributes) { + global $item, $element, $tag, $items, $channel; + + switch ($name) { + case 'IMAGE': + case 'TEXTINPUT': + case 'CONTENT': + case 'SUMMARY': + case 'TAGLINE': + case 'SUBTITLE': + case 'LOGO': + case 'INFO': + $element = $name; + break; + case 'ID': + if ($element != 'ITEM') { + $element = $name; + } + case 'LINK': + if ($attributes['REL'] == 'alternate') { + if ($element == 'ITEM') { + $items[$item]['LINK'] = $attributes['HREF']; + } + else { + $channel['LINK'] = $attributes['HREF']; + } + } + break; + case 'ITEM': + $element = $name; + $item += 1; + break; + case 'ENTRY': + $element = 'ITEM'; + $item += 1; + break; + } + + $tag = $name; +} + +/** + * Call-back function used by the XML parser. + */ +function aggregator_element_end($parser, $name) { + global $element; + + switch ($name) { + case 'IMAGE': + case 'TEXTINPUT': + case 'ITEM': + case 'ENTRY': + case 'CONTENT': + case 'INFO': + $element = ''; + break; + case 'ID': + if ($element == 'ID') { + $element = ''; + } + } +} + +/** + * Call-back function used by the XML parser. + */ +function aggregator_element_data($parser, $data) { + global $channel, $element, $items, $item, $image, $tag; + + switch ($element) { + case 'ITEM': + $items[$item][$tag] .= $data; + break; + case 'IMAGE': + case 'LOGO': + $image[$tag] .= $data; + break; + case 'LINK': + if ($data) { + $items[$item][$tag] .= $data; + } + break; + case 'CONTENT': + $items[$item]['CONTENT'] .= $data; + break; + case 'SUMMARY': + $items[$item]['SUMMARY'] .= $data; + break; + case 'TAGLINE': + case 'SUBTITLE': + $channel['DESCRIPTION'] .= $data; + break; + case 'INFO': + case 'ID': + case 'TEXTINPUT': + // The sub-element is not supported. However, we must recognize + // it or its contents will end up in the item array. + break; + default: + $channel[$tag] .= $data; + } +} + +/** + * Checks a news feed for new items. + */ +function aggregator_refresh($feed) { + global $channel, $image; + + // Generate conditional GET headers. + $headers = array(); + if ($feed['etag']) { + $headers['If-None-Match'] = $feed['etag']; + } + if ($feed['modified']) { + $headers['If-Modified-Since'] = gmdate('D, d M Y H:i:s', $feed['modified']) .' GMT'; + } + + // Request feed. + $result = drupal_http_request($feed['url'], $headers); + + // Process HTTP response code. + switch ($result->code) { + case 304: + db_query('UPDATE {aggregator_feed} SET checked = %d WHERE fid = %d', time(), $feed['fid']); + drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title'])))); + break; + case 301: + $feed['url'] = $result->redirect_url; + watchdog('aggregator', t('Updated URL for feed %title to %url.', array('%title' => theme('placeholder', $feed['title']), '%url' => theme('placeholder', $feed['url'])))); + + case 200: + case 302: + case 307: + // Filter the input data: + if (aggregator_parse_feed($result->data, $feed)) { + + if ($result->headers['Last-Modified']) { + $modified = strtotime($result->headers['Last-Modified']); + } + + /* + ** Prepare the channel data: + */ + + foreach ($channel as $key => $value) { + $channel[$key] = trim($value); + } + + /* + ** Prepare the image data (if any): + */ + + foreach ($image as $key => $value) { + $image[$key] = trim($value); + } + + if ($image['LINK'] && $image['URL'] && $image['TITLE']) { + // Note, we should really use theme_image() here but that only works with local images it won't work with images fetched with a URL unless PHP version > 5 + $image = '          '. check_plain($image['TITLE']) .''; + } + else { + $image = NULL; + } + + /* + ** Update the feed data: + */ + + db_query("UPDATE {aggregator_feed} SET url = '%s', checked = %d, link = '%s', description = '%s', image = '%s', etag = '%s', modified = %d WHERE fid = %d", $feed['url'], time(), $channel['LINK'], $channel['DESCRIPTION'], $image, $result->headers['ETag'], $modified, $feed['fid']); + + /* + ** Clear the cache: + */ + + cache_clear_all(); + + watchdog('aggregator', t('There is new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title'])))); + drupal_set_message(t('There is new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title'])))); + } + break; + default: + watchdog('aggregator', t('The RSS-feed from %site seems to be broken, due to "%error".', array('%site' => theme('placeholder', $feed['title']), '%error' => theme('placeholder', $result->code .' '. $result->error))), WATCHDOG_WARNING); + drupal_set_message(t('The RSS-feed from %site seems to be broken, because of error "%error".', array('%site' => theme('placeholder', $feed['title']), '%error' => theme('placeholder', $result->code .' '. $result->error)))); + } +} + +/** + * Parse the W3C date/time format, a subset of ISO 8601. PHP date parsing + * functions do not handle this format. + * See http://www.w3.org/TR/NOTE-datetime for more information. + * Originally from MagpieRSS (http://magpierss.sourceforge.net/). + * + * @param $date_str A string with a potentially W3C DTF date. + * @return A timestamp if parsed successfully or -1 if not. + */ +function aggregator_parse_w3cdtf($date_str) { + if (preg_match('/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/', $date_str, $match)) { + list($year, $month, $day, $hours, $minutes, $seconds) = array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]); + // calc epoch for current date assuming GMT + $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year); + if ($match[10] != 'Z') { // Z is zulu time, aka GMT + list($tz_mod, $tz_hour, $tz_min) = array($match[8], $match[9], $match[10]); + // zero out the variables + if (!$tz_hour) { + $tz_hour = 0; + } + if (!$tz_min) { + $tz_min = 0; + } + $offset_secs = (($tz_hour * 60) + $tz_min) * 60; + // is timezone ahead of GMT? then subtract offset + if ($tz_mod == '+') { + $offset_secs *= -1; + } + $epoch += $offset_secs; + } + return $epoch; + } + else { + return FALSE; + } +} + +function aggregator_parse_feed(&$data, $feed) { + global $items, $image, $channel; + + // Unset the global variables before we use them: + unset($GLOBALS['element'], $GLOBALS['item'], $GLOBALS['tag']); + $items = array(); + $image = array(); + $channel = array(); + + // parse the data: + $xml_parser = drupal_xml_parser_create($data); + xml_set_element_handler($xml_parser, 'aggregator_element_start', 'aggregator_element_end'); + xml_set_character_data_handler($xml_parser, 'aggregator_element_data'); + + if (!xml_parse($xml_parser, $data, 1)) { + watchdog('aggregator', t('The RSS-feed from %site seems to be broken, due to an error "%error" on line %line.', array('%site' => theme('placeholder', $feed['title']), '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), WATCHDOG_WARNING); + drupal_set_message(t('The RSS-feed from %site seems to be broken, because of error "%error" on line %line.', array('%site' => theme('placeholder', $feed['title']), '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), 'error'); + return 0; + } + xml_parser_free($xml_parser); + + /* + ** We reverse the array such that we store the first item last, + ** and the last item first. In the database, the newest item + ** should be at the top. + */ + + $items = array_reverse($items); + + foreach ($items as $item) { + unset($title, $link, $author, $description); + + // Prepare the item: + foreach ($item as $key => $value) { + $item[$key] = trim($value); + } + + /* + ** Resolve the item's title. If no title is found, we use + ** up to 40 characters of the description ending at a word + ** boundary but not splitting potential entities. + */ + + if ($item['TITLE']) { + $title = $item['TITLE']; + } + else { + $title = preg_replace('/^(.*)[^\w;&].*?$/', "\\1", truncate_utf8($item['DESCRIPTION'], 40)); + } + + /* + ** Resolve the items link. + */ + + if ($item['LINK']) { + $link = $item['LINK']; + } + elseif ($item['GUID'] && (strncmp($item['GUID'], 'http://', 7) == 0)) { + $link = $item['GUID']; + } + else { + $link = $feed['link']; + } + + /** + * Atom feeds have a CONTENT and/or SUMMARY tag instead of a DESCRIPTION tag + */ + if ($item['CONTENT:ENCODED']) { + $item['DESCRIPTION'] = $item['CONTENT:ENCODED']; + } + else if ($item['SUMMARY']) { + $item['DESCRIPTION'] = $item['SUMMARY']; + } + + /* + ** Try to resolve and parse the item's publication date. If no + ** date is found, we use the current date instead. + */ + + if ($item['PUBDATE']) $date = $item['PUBDATE']; // RSS 2.0 + else if ($item['DC:DATE']) $date = $item['DC:DATE']; // Dublin core + else if ($item['DCTERMS:ISSUED']) $date = $item['DCTERMS:ISSUED']; // Dublin core + else if ($item['DCTERMS:CREATED']) $date = $item['DCTERMS:CREATED']; // Dublin core + else if ($item['DCTERMS:MODIFIED']) $date = $item['DCTERMS:MODIFIED']; // Dublin core + else if ($item['ISSUED']) $date = $item['ISSUED']; // Atom XML + else if ($item['CREATED']) $date = $item['CREATED']; // Atom XML + else if ($item['MODIFIED']) $date = $item['MODIFIED']; // Atom XML + else $date = 'now'; + + $timestamp = strtotime($date); // As of PHP 5.1.0, strtotime returns FALSE on failure instead of -1. + if ($timestamp <= 0) { + $timestamp = aggregator_parse_w3cdtf($date); // Returns FALSE on failure + if (!$timestamp) { + $timestamp = time(); // better than nothing + } + } + + /* + ** Save this item. Try to avoid duplicate entries as much as + ** possible. If we find a duplicate entry, we resolve it and + ** pass along it's ID such that we can update it if needed. + */ + + if ($link && $link != $feed['link'] && $link != $feed['url']) { + $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND link = '%s'", $feed['fid'], $link)); + } + else { + $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND title = '%s'", $feed['fid'], $title)); + } + + aggregator_save_item(array('iid' => $entry->iid, 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION'])); + } + + /* + ** Remove all items that are older than flush item timer: + */ + + $age = time() - variable_get('aggregator_clear', 9676800); + $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d AND timestamp < %d', $feed['fid'], $age); + + if (db_num_rows($result)) { + $items = array(); + while ($item = db_fetch_object($result)) { + $items[] = $item->iid; + } + db_query('DELETE FROM {aggregator_category_item} WHERE iid IN ('. implode(', ', $items) .')'); + db_query('DELETE FROM {aggregator_item} WHERE fid = %d AND timestamp < %d', $feed['fid'], $age); + } + + return 1; +} + +function aggregator_save_item($edit) { + if ($edit['iid'] && $edit['title']) { + db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = '%s' WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['iid']); + } + else if ($edit['iid']) { + db_query('DELETE FROM {aggregator_item} WHERE iid = %d', $edit['iid']); + db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $edit['iid']); + } + else if ($edit['title'] && $edit['link']) { + $edit['iid'] = db_next_id('{aggregator_item}_iid'); + db_query("INSERT INTO {aggregator_item} (iid, fid, title, link, author, description, timestamp) VALUES (%d, %d, '%s', '%s', '%s', '%s', %d)", $edit['iid'], $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['timestamp']); + // file the items in the categories indicated by the feed + $categories = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']); + while ($category = db_fetch_object($categories)) { + db_query('INSERT INTO {aggregator_category_item} (cid, iid) VALUES (%d, %d)', $category->cid, $edit['iid']); + } + } +} + +function aggregator_get_feed($fid) { + return db_fetch_array(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', $fid)); +} + +function aggregator_get_category($cid) { + return db_fetch_array(db_query('SELECT * FROM {aggregator_category} WHERE cid = %d', $cid)); +} + +function aggregator_view() { + $result = db_query('SELECT f.*, COUNT(i.iid) AS items FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.checked, f.link, f.description, f.etag, f.modified, f.image, f.block ORDER BY f.title'); + + $output .= '

          '. t('Feed overview') .'

          '; + + $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3')); + $rows = array(); + while ($feed = db_fetch_object($result)) { + $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '%count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/aggregator/remove/$feed->fid"), l(t('update items'), "admin/aggregator/update/$feed->fid")); + } + $output .= theme('table', $header, $rows); + + $result = db_query('SELECT c.cid, c.title, count(ci.iid) as items FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid GROUP BY c.cid, c.title ORDER BY title'); + + $output .= '

          '. t('Category overview') .'

          '; + + $header = array(t('Title'), t('Items'), t('Operations')); + $rows = array(); + while ($category = db_fetch_object($result)) { + $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit'), "admin/aggregator/edit/category/$category->cid")); + } + $output .= theme('table', $header, $rows); + + return $output; +} + +/** + * Menu callback; removes all items from a feed, then redirects to the overview page. + */ +function aggregator_admin_remove_feed($feed) { + aggregator_remove(aggregator_get_feed($feed)); + drupal_goto('admin/aggregator'); +} + +/** + * Menu callback; refreshes a feed, then redirects to the overview page. + */ +function aggregator_admin_refresh_feed($feed) { + aggregator_refresh(aggregator_get_feed($feed)); + drupal_goto('admin/aggregator'); +} + +/** + * Menu callback; displays the aggregator administration page. + */ +function aggregator_admin_overview() { + return aggregator_view(); +} + +/** + * Menu callback; displays the most recent items gathered from any feed. + */ +function aggregator_page_last() { + return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', arg(1)); +} + +/** + * Menu callback; displays all the items captured from a particular feed. + */ +function aggregator_page_source() { + $feed = db_fetch_object(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', arg(2))); + $info = theme('aggregator_feed', $feed); + + return _aggregator_page_list('SELECT * FROM {aggregator_item} WHERE fid = '. $feed->fid .' ORDER BY timestamp DESC, iid DESC', arg(3), $info); +} + +/** + * Menu callback; displays all the items aggregated in a particular category. + */ +function aggregator_page_category() { + $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2))); + + return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = '. $category->cid .' ORDER BY timestamp DESC, iid DESC', arg(3)); +} + +/** + * Prints an aggregator page listing a number of feed items. Various + * menu callbacks use this function to print their feeds. + */ +function _aggregator_page_list($sql, $op, $header = '') { + $categorize = (user_access('administer news feeds') && ($op == 'categorize')); + + $output = '
          '; + + $form['header'] = array('#value' => $header); + $output .= $form['header']['#value']; + + $result = pager_query($sql, 20); + $categories = array(); + while ($item = db_fetch_object($result)) { + $form['items'][$item->iid] = array('#value' => theme('aggregator_page_item', $item)); + $output .= $form['items'][$item->iid]['#value']; + $form['categories'][$item->iid] = array(); + + if ($categorize) { + + $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = %d', $item->iid); + $selected = array(); + while ($category = db_fetch_object($categories_result)) { + if (!$done) { + $categories[$category->cid] = check_plain($category->title); + } + if ($category->iid) { + $selected[] = $category->cid; + } + } + $done = true; + $form['categories'][$item->iid] = array( + '#type' => variable_get('aggregator_category_selector', 'checkboxes'), + '#default_value' => $selected, '#options' => $categories, + '#size' => 10, '#multiple' => true + ); + } + } + $output .= '
          '; + $form['submit'] = array('#type' => 'submit', '#value' => t('Save categories')); + $form['pager'] = array('#value' => theme('pager', NULL, 20, 0)); + $output .= $form['pager']['#value']; + + // arg(1) is undefined if we are at the top aggregator URL + // is there a better way to do this? + if (!arg(1)) { + $form['feed_icon'] = array('#value' => theme('feed_icon', url('aggregator/rss'))); + } + elseif (arg(1) == 'categories' && arg(2) && !arg(3)) { + $form['feed_icon'] = array('#value' => theme('feed_icon', url('aggregator/rss/' . arg(2)))); + } + $output .= $form['feed_icon']['#value']; + + return ($categorize) ? drupal_get_form('aggregator_page_list', $form) : $output; +} + +function theme_aggregator_page_list($form) { + $output = '
          '; + $output .= form_render($form['header']); + $rows = array(); + if ($form['items']) { + foreach (element_children($form['items']) as $key) { + if (is_array($form['items'][$key])) { + $rows[] = array(form_render($form['items'][$key]), array('data' => form_render($form['categories'][$key]), 'class' => 'categorize-item')); + } + } + } + $output .= theme('table', array('', t('Categorize')), $rows); + $output .= form_render($form['submit']); + $output .= '
          '; + $output .= form_render($form); + return $output; +} + +function aggregator_page_list_validate($form_id, &$form) { + if (!user_access('administer news feeds')) { + form_error($form, t('You are not allowed to categorize this feed item.')); + } +} + +function aggregator_page_list_submit($form_id, $form_values) { + foreach ($form_values as $iid => $selection) { + db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $iid); + foreach ($selection as $cid) { + if ($cid) { + db_query('INSERT INTO {aggregator_category_item} (cid, iid) VALUES (%d, %d)', $cid, $iid); + } + } + } + drupal_set_message(t('The categories have been saved.')); +} + +/** + * Menu callback; displays all the feeds used by the aggregator. + */ +function aggregator_page_sources() { + $result = db_query('SELECT f.fid, f.title, f.description, f.image, MAX(i.timestamp) AS last FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.description, f.image ORDER BY last DESC, f.title'); + $output = "
          \n"; + while ($feed = db_fetch_object($result)) { + $output .= '

          '. check_plain($feed->title) ."

          \n"; + + // Most recent items: + $list = array(); + if (variable_get('aggregator_summary_items', 3)) { + $items = db_query_range('SELECT i.title, i.timestamp, i.link FROM {aggregator_item} i WHERE i.fid = %d ORDER BY i.timestamp DESC', $feed->fid, 0, variable_get('aggregator_summary_items', 3)); + while ($item = db_fetch_object($items)) { + $list[] = theme('aggregator_summary_item', $item); + } + } + $output .= theme('item_list', $list); + $output .= '
          '. theme('links', array(l(t('more'), 'aggregator/sources/'. $feed->fid))) ."
          \n"; + } + $output .= theme('xml_icon', url('aggregator/opml')); + $output .= '
          '; + return $output; +} + +/** + * Menu callback; generate an RSS 0.92 feed of aggregator items or categories. + */ +function aggregator_page_rss() { + // arg(2) is the passed cid, only select for that category + $result = NULL; + if (arg(2)) { + $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2))); + $url = '/categories/' . $category->cid; + $title = ' ' . t('in category') . ' ' . $category->title; + $sql = 'SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = %d ORDER BY timestamp DESC, iid DESC'; + $result = db_query_range($sql, $category->cid, 0, variable_get('feed_default_items', 10)); + } + // or, get the default aggregator items + else { + $sql = 'SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC'; + $result = db_query_range($sql, 0, variable_get('feed_default_items', 10)); + } + + while ($item = db_fetch_object($result)) { + switch (variable_get('feed_item_length', 'teaser')) { + case 'teaser': + $teaser = node_teaser($item->description); + if ($teaser != $item->description) { + $teaser .= '

          '. t('read more') ."

          \n"; + } + $item->description = $teaser; + break; + case 'title': + $item->description = ''; + break; + } + $items .= format_rss_item($item->ftitle . ': ' . $item->title, $item->link, $item->description, array('pubDate' => date('r', $item->timestamp))); + } + + $output .= "\n"; + $output .= "\n"; + $output .= format_rss_channel(variable_get('site_name', t('Drupal')) . ' ' . t('aggregator'), url('aggregator' . $url, NULL, NULL, TRUE), variable_get('site_name', t('Drupal')) . ' - ' . t('aggregated feeds') . $title, $items, 'en'); + $output .= "\n"; + + drupal_set_header('Content-Type: application/rss+xml; charset=utf-8'); + print $output; +} + +/** + * Menu callback; generates an OPML representation of all feeds. + */ +function aggregator_page_opml($cid = NULL) { + if ($cid) { + $result = db_query('SELECT f.title, f.url FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} c on f.fid = c.fid WHERE c.cid = %d ORDER BY title', $cid); + } + else { + $result = db_query('SELECT * FROM {aggregator_feed} ORDER BY title'); + } + + $output = "\n"; + $output .= "\n"; + $output .= "\n"; + $output .= ''. check_plain(variable_get('site_name', 'Drupal')) ."\n"; + $output .= ''. gmdate('r') ."\n"; + $output .= "\n"; + $output .= "\n"; + + while ($feed = db_fetch_object($result)) { + $output .= '\n"; + } + + $output .= "\n"; + $output .= "\n"; + + drupal_set_header('Content-Type: text/xml; charset=utf-8'); + print $output; +} + +/** + * Menu callback; displays all the categories used by the aggregator. + */ +function aggregator_page_categories() { + $result = db_query('SELECT c.cid, c.title, c.description FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid LEFT JOIN {aggregator_item} i ON ci.iid = i.iid GROUP BY c.cid, c.title, c.description'); + $output = "
          \n"; + + while ($category = db_fetch_object($result)) { + $output .= '

          '. check_plain($category->title) ."

          \n"; + if (variable_get('aggregator_summary_items', 3)) { + $list = array(); + $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = %d ORDER BY i.timestamp DESC', $category->cid, 0, variable_get('aggregator_summary_items', 3)); + while ($item = db_fetch_object($items)) { + $list[] = theme('aggregator_summary_item', $item); + } + $output .= theme('item_list', $list); + } + $output .= '
          '. theme('links', array(l(t('more'), 'aggregator/categories/'. $category->cid))) ."
          \n"; + } + $output .= '
          '; + + return $output; +} + +/** + * Format a news feed. + * + * @ingroup themeable + */ +function theme_aggregator_feed($feed) { + $output = '
          '; + $output .= theme('feed_icon', $feed->url) ."\n"; + $output .= $feed->image; + $output .= '
          '. aggregator_filter_xss($feed->description) ."
          \n"; + $output .= '
          '. t('URL:') .' '. l($feed->link, $feed->link, array(), NULL, NULL, TRUE) ."
          \n"; + + if ($feed->checked) { + $updated = t('%time ago', array('%time' => format_interval(time() - $feed->checked))); + } + else { + $updated = t('never'); + } + + if (user_access('administer news feeds')) { + $updated = l($updated, 'admin/aggregator'); + } + + $output .= '
          '. t('Updated:') . " $updated
          "; + $output .= "
          \n"; + + return $output; +} + +/** + * Format an individual feed item for display in the block. + * + * @ingroup themeable + */ +function theme_aggregator_block_item($item, $feed = 0) { + global $user; + + if ($user->uid && module_exist('blog') && user_access('edit own blog')) { + if ($image = theme('image', 'misc/blog.png', t('blog it'), t('blog it'))) { + $output .= '
          '. l($image, 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid", NULL, FALSE, TRUE) .'
          '; + } + } + + // Display the external link to the item. + $output .= ''. check_plain($item->title) ."\n"; + + return $output; +} + +/** + * Return a themed item heading for summary pages located at "aggregator/sources" + * and "aggregator/categories". + * + * @param $item The item object from the aggregator module. + * @return A string containing the output. + * + * @ingroup themeable + */ +function theme_aggregator_summary_item($item) { + $output = ''. check_plain($item->title) .' '. t('%age old', array('%age' => format_interval(time() - $item->timestamp))) .''; + if ($item->feed_link) { + $output .= ', '. check_plain($item->feed_title) .''; + } + return $output ."\n"; +} + +/** + * Format an individual feed item for display on the aggregator page. + * + * @ingroup themeable + */ +function theme_aggregator_page_item($item) { + + $source = ''; + if ($item->ftitle && $item->fid) { + $source = l($item->ftitle, "aggregator/sources/$item->fid", array('class' => 'feed-item-source')) . ' -'; + } + + if (date('Ymd', $item->timestamp) == date('Ymd')) { + $source_date = t('%ago ago', array('%ago' => format_interval(time() - $item->timestamp))); + } + else { + $source_date = format_date($item->timestamp, 'custom', variable_get('date_format_medium', 'D, Y-m-d H:i')); + } + + $output .= "
          \n"; + $output .= '

          '. check_plain($item->title) ."

          \n"; + $output .= "
          $source $source_date
          \n"; + + if ($item->description) { + $output .= '
          '. aggregator_filter_xss($item->description) ."
          \n"; + } + + $result = db_query('SELECT c.title, c.cid FROM {aggregator_category_item} ci LEFT JOIN {aggregator_category} c ON ci.cid = c.cid WHERE ci.iid = %d ORDER BY c.title', $item->iid); + $categories = array(); + while ($category = db_fetch_object($result)) { + $categories[] = l($category->title, 'aggregator/categories/'. $category->cid); + } + if ($categories) { + $output .= '
          '. t('Categories') .': '. implode(', ', $categories) ."
          \n"; + } + + $output .= "
          \n"; + + return $output; +} + +/** + * Safely render HTML content, as allowed. + */ +function aggregator_filter_xss($value) { + return filter_xss($value, preg_split('/\s+|<|>/', variable_get("aggregator_allowed_html_tags", '

            • '), -1, PREG_SPLIT_NO_EMPTY)); +} + +/** + * Helper function for drupal_map_assoc. + */ +function _aggregator_items($count) { + return format_plural($count, '1 item', '%count items'); +} diff --git a/modules/archive.module b/modules/archive.module new file mode 100644 index 0000000..d015cb5 --- /dev/null +++ b/modules/archive.module @@ -0,0 +1,291 @@ +'. t('The archive page allows content to be viewed by date. It also provides a monthly calendar view that users can use to navigate through content.') .'

              '; + $output .= '

              '. t('To view the archive by date, select the date in the calendar. Administrators can enable the browse archives block in block administration to allow users to browse by calendar. Clicking on a date in the monthly calendar view shows the content for that date. Users can navigate to different months using arrows beside the month\'s name in the calendar display. The current date will be highlighted in the calendar.') .'

              '; + $output .= t('

              You can

              +               +', array('%archive' => url('archive'), '%admin-block' => url('admin/block'))); + $output .= '

              '. t('For more information please read the configuration and customization handbook Archive page.', array('%archive' => 'http://drupal.org/handbook/modules/archive/')) .'

              '; + return $output; + case 'admin/modules#description': + return t('Displays a calendar for navigating older content.'); + } +} + +/** + * Implementation of hook_menu(). + */ +function archive_menu($may_cache) { + $items = array(); + + if ($may_cache) { + $items[] = array('path' => 'archive', + 'title' => t('archives'), + 'access' => user_access('access content'), + 'callback' => 'archive_page', + 'type' => MENU_SUGGESTED_ITEM); + } + return $items; +} + +/** + * Implementation of hook_block(). + * + * Generates a calendar for the current month, with links to the archives + * for each day. + */ +function archive_block($op = 'list', $delta = 0) { + if ($op == 'list') { + $blocks[0]['info'] = t('Calendar to browse archives'); + return $blocks; + } + else if ($op == 'view' && user_access('access content')) { + $block['subject'] = t('Browse archives'); + $block['content'] = archive_calendar(); + return $block; + } +} + +/** + * Generates a monthly calendar, for display in the archive block. + */ +function archive_calendar() { + global $user; + + // Extract today's date: + $start_of_today = mktime(0, 0, 0, date('n', time()), date('d', time()), date('Y', time())) + $user->timezone; + $end_of_today = mktime(23, 59, 59, date('n', time()), date('d', time()), date('Y', time())) + $user->timezone; + + // Extract the requested date: + if (arg(0) == 'archive' && arg(3)) { + $year = arg(1); + $month = arg(2); + $day = arg(3); + + $requested = mktime(0, 0, 0, $month, $day, $year) + $user->timezone; + } + else { + $year = date('Y', time()); + $month = date('n', time()); + $day = date('d', time()); + + $requested = $end_of_today + $user->timezone; + } + + $start_of_month = mktime(0, 0, 0, $month, 1, $year); + + // Extract first day of the month: + $first = date('w', $start_of_month); + + // Extract last day of the month: + $last = date('t', $start_of_month); + + $end_of_month = mktime(23, 59, 59, $month, $last, $year); + + $cache = cache_get("archive:calendar:$day-$month-$year"); + + if (!empty($cache)) { + return $cache->data; + } + + // Calculate previous and next months dates and check for shorter months (28/30 days) + $prevmonth = mktime(23, 59, 59, $month - 1, 1, $year); + $prev = mktime(23, 59, 59, $month - 1, min(date('t', $prevmonth), $day), $year); + $nextmonth = mktime(23, 59, 59, $month + 1, 1, $year); + $next = mktime(23, 59, 59, $month + 1, min(date('t', $nextmonth), $day), $year); + + $sql = 'SELECT n.nid, n.created FROM {node} n WHERE n.status = 1 AND n.created > %d AND n.created < %d ORDER BY n.created'; + $sql = db_rewrite_sql($sql); + $result = db_query($sql, $start_of_month, $end_of_month); + + $days_with_posts = array(); + while ($day_with_post = db_fetch_object($result)) { + $daynum = date('j', $day_with_post->created + $user->timezone); + if (isset($days_with_posts[$daynum])) { + $days_with_posts[$daynum]++; + } + else { + $days_with_posts[$daynum] = 1; + } + } + + // Generate calendar header: + $output .= "\n\n"; + $output .= '
              '; + $output .= '\n"; + $output .= ' \n"; + + // First day of week (0 => Sunday, 1 => Monday, ...) + $weekstart = variable_get('date_first_day', 0); + + // Last day of week + ($weekstart - 1 == -1) ? $lastday = 6 : $lastday = $weekstart - 1; + + // Generate the days of the week: + $firstcolumn = mktime(0, 0, 0, 3, 20 + $weekstart, 1994); + + $output .= " \n"; + $days = array(t('Sunday') => t('Su'), t('Monday') => t('Mo'), t('Tuesday') => t('Tu'), t('Wednesday') => t('We'), t('Thursday') => t('Th'), t('Friday') => t('Fr'), t('Saturday') => t('Sa')); + if ($weekstart) { + $days = array_merge(array_slice($days, $weekstart), array_slice($days, 0, $weekstart)); + } + + foreach ($days as $fullname => $name) { + $output .= ' \n"; + } + $output .= "\n"; + + // Initialize temporary variables: + $nday = 1; + $sday = $first; + + // Loop through all the days of the month: + while ($nday <= $last) { + // Set up blank days for first week of the month (allowing individual blank day styling): + if ($first != $weekstart) { + $blankdays = ($first - $weekstart + 7) % 7; + $output .= " " . str_repeat("\n", $blankdays); + $first = $weekstart; + } + // Start every week on a new line: + if ($sday == $weekstart) { + $output .= " \n"; + } + + // Print one cell: + $date = mktime(0, 0, 0, $month, $nday, $year) + $user->timezone; + if (isset($days_with_posts[$nday])) { + $daytext = l($nday, "archive/$year/$month/$nday", array("title" => format_plural($days_with_posts[$nday], "1 post", "%count posts"))); + $dayclass = 'day-link'; + } + else { + $daytext = $nday; + $dayclass = 'day-normal'; + } + if ($date == $requested) { + $output .= " \n"; + } + else if ($date == $start_of_today) { + $output .= " \n"; + } + else if ($date > $end_of_today) { + $output .= " \n"; + } + else { + $output .= " \n"; + } + + // Start every week on a new line: + if ($sday == $lastday) { + $output .= " \n"; + } + + // Update temporary variables: + $sday++; + $sday = $sday % 7; + $nday++; + } + + // Complete the calendar (allowing individual blank day styling): + if ($sday != $weekstart) { + $end = (7 - $sday + $weekstart) % 7; + $output .= str_repeat("\n", $end) . "\n"; + } + + $output .= "
              '. l('«', 'archive/'. date('Y/m/d', $prev), array('title' => t('Previous month'))) .' '. format_date($requested, 'custom', 'F') . date(' Y', $requested) .' '. ($nextmonth <= time() ? l('»', 'archive/'. date('Y/m/d', $next), array('title' => t('Next month'))) : ' ') ."
              '. $name . "
               
              $daytext$daytext$daytext$daytext
               
              \n\n"; + + cache_set("archive:calendar:$day-$month-$year", $output, CACHE_TEMPORARY); + + return $output; +} + +/** + * Menu callback; lists all nodes posted on a given date. + */ +function archive_page($year = 0, $month = 0, $day = 0) { + global $user; + + $date = mktime(0, 0, 0, $month, $day, $year) - $user->timezone; + $date_end = mktime(0, 0, 0, $month, $day + 1, $year) - $user->timezone; + + // Display form. + $output = archive_browse_form($year, $month, $day); + + if ($year && $month && $day) { + // Fetch nodes for the selected date, if one was specified. + $sql = 'SELECT n.nid, n.created FROM {node} n WHERE n.status = 1 AND n.created > %d AND n.created < %d ORDER BY n.created'; + $sql = db_rewrite_sql($sql); + $result = db_query_range($sql, $date, $date_end, 0, 20); + if (db_num_rows($result) > 0) { + while ($nid = db_fetch_object($result)) { + $output .= node_view(node_load($nid->nid), 1); + } + } + else { + $output .= theme('box', t('No posts found.'), ''); + } + } + else { + $output .= theme('box', t('No posts found.'), ''); + } + + return $output; +} + +/** + * Generate a form that retrieves archives for a certain date. + */ +function archive_browse_form($year, $month, $day) { + // Prepare the values of the form fields. + $years = drupal_map_assoc(range(2000, date('Y'))); + $months = array(1 => t('January'), 2 => t('February'), 3 => t('March'), 4 => t('April'), 5 => t('May'), 6 => t('June'), 7 => t('July'), 8 => t('August'), 9 => t('September'), 10 => t('October'), 11 => t('November'), 12 => t('December')); + $days = drupal_map_assoc(range(1, 31)); + + $form['year'] = array('#type' => 'select', + '#default_value' => ($year ? $year : date('Y')), + '#options' => $years, + ); + $form['month'] = array('#type' => 'select', + '#default_value' => ($month ? $month : date('m')), + '#options' => $months, + ); + $form['day'] = array('#type' => 'select', + '#default_value' => ($day ? $day : date('d')), + '#options' => $days, + ); + $form['show'] = array('#type' => 'submit', + '#value' => t('Show'), + ); + + return drupal_get_form('archive_browse_form', $form); +} + +/** + * Process archive browse form submission. + */ +function archive_browse_form_submit($form_id, $form_values) { + return('archive/'. $form_values['year'] .'/'. $form_values['month'] .'/'. $form_values['day']); +} + +/** + * Form theme function; displays the archive date navigation form inline. + */ +function theme_archive_browse_form($form) { + $output = '
              ' . form_render($form) . '
              '; + return $output; +} diff --git a/modules/block.module b/modules/block.module new file mode 100644 index 0000000..c4ea29d --- /dev/null +++ b/modules/block.module @@ -0,0 +1,660 @@ +'. t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. Blocks are usually generated automatically by modules (e.g., Recent Forum Topics), but administrators can also define custom blocks.') .'

              '; + $output .= '

              '. t('The region each block appears in depends on both which theme you are using (some themes allow greater control over block placement than others), and on the settings in the block administration section.') .'

              '; + $output .= '

              '. t('The block administration screen lets you specify the vertical placement of the blocks within a region. You do this by assigning a weight to each block. Lighter blocks (those having a smaller weight) "float up" towards the top of the region; heavier ones "sink".') .'

              '; + $output .= t('

              A block\'s visibility depends on:

              +
                +
              • Its enabled checkbox. Disabled blocks are never shown.
                • +
              • Its throttle checkbox. Throttled blocks are hidden during high server loads.
                • +
              • Its page visibility settings. Blocks can be configured to be visible/hidden on certain pages.
                • +
              • Its custom visibility settings. Blocks can be configured to be visible only when specific conditions are true.
                • +
              • Its user visibility settings. Administrators can choose to let users decide whether to show/hide certain blocks.
                • +
              • Its function. Some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.
                • +
              +'); + $output .= '

              '. t('Module blocks') .'

              '; + $output .= '

              '. t('Some modules generate blocks that become available when the modules are enabled. These blocks can be administered via the blocks administration page.

              ', array('%admin-block' => url('admin/block'))) .'

              '; + $output .= '

              '. t('Administrator defined blocks') .'

              '; + $output .= '

              '. t('Administrators can also define custom blocks. These blocks consist of a title, a description, and a body which can be as long as you wish. Block content can be in any of the input formats supported for other content.') .'

              '; + $output .= t('

              You can

              + +', array('%admin-block' => url('admin/block'), '%admin-block-add' => url('admin/block/add'))); + $output .= '

              '. t('For more information please read the configuration and customization handbook Block page.', array('%block' => 'http://drupal.org/handbook/modules/block/')) .'

              '; + return $output; + case 'admin/modules#description': + return t('Controls the boxes that are displayed around the main content.'); + case 'admin/block': + return t(" +

              Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.

              +

              Only enabled blocks are shown. You can position blocks by specifying which area of the page they should appear in (e.g., a sidebar). Highlighted labels on this page show the regions into which blocks can be rendered. You can specify where within a region a block will appear by adjusting its weight.

              +

              If you want certain blocks to disable themselves temporarily during high server loads, check the 'Throttle' box. You can configure the auto-throttle on the throttle configuration page after having enabled the throttle module.

              +

              You can configure the behaviour of each block (for example, specifying on which pages and for what users it will appear) by clicking the 'configure' link for each block.

              +", array('%throttle' => url('admin/settings/throttle'))); + case 'admin/block/add': + return t('

              Here you can create a new block. Once you have created this block you must make it active and give it a place on the page using blocks. The title is used when displaying the block. The description is used in the "block" column on the blocks page.

              ', array('%overview' => url('admin/block'))); + } +} + +/** + * Implementation of hook_perm(). + */ +function block_perm() { + return array('administer blocks', 'use PHP for block visibility'); +} + +/** + * Implementation of hook_menu(). + */ +function block_menu($may_cache) { + $items = array(); + + if ($may_cache) { + $items[] = array('path' => 'admin/block', 'title' => t('blocks'), + 'access' => user_access('administer blocks'), + 'callback' => 'block_admin_display'); + $items[] = array('path' => 'admin/block/list', 'title' => t('list'), + 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); + $items[] = array('path' => 'admin/block/configure', 'title' => t('configure block'), + 'access' => user_access('administer blocks'), + 'callback' => 'block_admin_configure', + 'type' => MENU_CALLBACK); + $items[] = array('path' => 'admin/block/delete', 'title' => t('delete block'), + 'access' => user_access('administer blocks'), + 'callback' => 'block_box_delete', + 'type' => MENU_CALLBACK); + $items[] = array('path' => 'admin/block/add', 'title' => t('add block'), + 'access' => user_access('administer blocks'), + 'callback' => 'block_box_add', + 'type' => MENU_LOCAL_TASK); + foreach (list_themes() as $key => $theme) { + if ($theme->status) { + if ($key == variable_get('theme_default', 'bluemarine')) { + $items[] = array('path' => 'admin/block/list/' . $key, 'title' => t('%key settings', array('%key' => $key)), + 'access' => user_access('administer blocks'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); + } + else { + $items[] = array('path' => 'admin/block/list/' . $key, 'title' => t('%key settings', array('%key' => $key)), + 'access' => user_access('administer blocks'), 'type' => MENU_LOCAL_TASK); + } + } + } + } + + return $items; +} + +/** + * Implementation of hook_block(). + * + * Generates the administrator-defined blocks for display. + */ +function block_block($op = 'list', $delta = 0, $edit = array()) { + switch ($op) { + case 'list': + $blocks = array(); + + $result = db_query('SELECT bid, title, info FROM {boxes} ORDER BY title'); + while ($block = db_fetch_object($result)) { + $blocks[$block->bid]['info'] = $block->info ? check_plain($block->info) : check_plain($block->title); + } + return $blocks; + + case 'configure': + $box = block_box_get($delta); + if (filter_access($box['format'])) { + return block_box_form($box); + } + break; + + case 'save': + block_box_save($edit, $delta); + break; + + case 'view': + $block = db_fetch_object(db_query('SELECT * FROM {boxes} WHERE bid = %d', $delta)); + $data['subject'] = check_plain($block->title); + $data['content'] = check_markup($block->body, $block->format, FALSE); + return $data; + } +} + +/** + * Update the 'blocks' DB table with the blocks currently exported by modules. + * + * @return + * Blocks currently exported by modules. + */ +function _block_rehash() { + global $theme_key; + + init_theme(); + + $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme_key); + while ($old_block = db_fetch_object($result)) { + $old_blocks[$old_block->module][$old_block->delta] = $old_block; + } + + db_query("DELETE FROM {blocks} WHERE theme = '%s'", $theme_key); + + foreach (module_list() as $module) { + $module_blocks = module_invoke($module, 'block', 'list'); + if ($module_blocks) { + foreach ($module_blocks as $delta => $block) { + $block['module'] = $module; + $block['delta'] = $delta; + // If previously written to database, load values. + if ($old_blocks[$module][$delta]) { + $block['status'] = $old_blocks[$module][$delta]->status; + $block['weight'] = $old_blocks[$module][$delta]->weight; + $block['region'] = $old_blocks[$module][$delta]->region; + $block['visibility'] = $old_blocks[$module][$delta]->visibility; + $block['pages'] = $old_blocks[$module][$delta]->pages; + $block['custom'] = $old_blocks[$module][$delta]->custom; + $block['throttle'] = $old_blocks[$module][$delta]->throttle; + } + // Otherwise, use any set values, or else substitute defaults. + else { + $properties = array('status' => 0, 'weight' => 0, 'region' => 'left', 'pages' => '', 'custom' => 0); + foreach ($properties as $property => $default) { + if (!isset($block[$property])) { + $block[$property] = $default; + } + } + } + + // Reinsert blocks into table + db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, visibility, pages, custom, throttle) VALUES ('%s', '%s', '%s', %d, %d, '%s', %d, '%s', %d, %d)", + $block['module'], $block['delta'], $theme_key, $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle']); + $blocks[] = $block; + } + } + } + + return $blocks; +} + +/** + * Generate main block administration form. + */ +function block_admin_display() { + global $theme_key, $custom_theme; + + // If non-default theme configuration has been selected, set the custom theme. + if (arg(3)) { + $custom_theme = arg(3); + } + else { + $custom_theme = variable_get('theme_default', 'bluemarine'); + } + init_theme(); + + // Fetch and sort blocks + $blocks = _block_rehash(); + usort($blocks, '_block_compare'); + + $throttle = module_exist('throttle'); + $block_regions = system_region_list($theme_key); + + // Build form tree + $form['#action'] = arg(3) ? url('admin/block/list/' . $theme_key) : url('admin/block'); + $form['#tree'] = TRUE; + foreach ($blocks as $i => $block) { + $form[$i]['module'] = array('#type' => 'value', '#value' => $block['module']); + $form[$i]['delta'] = array('#type' => 'value', '#value' => $block['delta']); + $form[$i]['info'] = array('#value' => $block['info']); + $form[$i]['status'] = array('#type' => 'checkbox', '#default_value' => $block['status']); + $form[$i]['theme'] = array('#type' => 'hidden', '#value' => $theme_key); + $form[$i]['weight'] = array('#type' => 'weight', '#default_value' => $block['weight']); + $form[$i]['region'] = array('#type' => 'select', + '#default_value' => isset($block['region']) ? $block['region'] : system_default_region($theme_key), + '#options' => $block_regions, + ); + + if ($throttle) { + $form[$i]['throttle'] = array('#type' => 'checkbox', '#default_value' => $block['throttle']); + } + $form[$i]['configure'] = array('#value' => l(t('configure'), 'admin/block/configure/'. $block['module'] .'/'. $block['delta'])); + if ($block['module'] == 'block') { + $form[$i]['delete'] = array('#value' => l(t('delete'), 'admin/block/delete/'. $block['delta'])); + } + } + $form['submit'] = array('#type' => 'submit', '#value' => t('Save blocks')); + + return drupal_get_form('block_admin_display', $form); +} + +/** + * Helper function for sorting blocks on admin/block. + * + * Active blocks are sorted by region, then by weight. + * Disabled blocks are sorted by name. + */ +function _block_compare($a, $b) { + $status = $b['status'] - $a['status']; + // Separate enabled from disabled. + if ($status) { + return $status; + } + // Enabled blocks + if ($a['status']) { + $place = strcmp($a['region'], $b['region']); + return $place ? $place : ($a['weight'] - $b['weight']); + } + // Disabled blocks + else { + return strcmp($a['info'], $b['info']); + } +} + +/** + * Process main block administration form submission. + */ +function block_admin_display_submit($form_id, $form_values) { + foreach ($form_values as $block) { + db_query("UPDATE {blocks} SET status = %d, weight = %d, region = '%s', throttle = %d WHERE module = '%s' AND delta = '%s' AND theme = '%s'", $block['status'], $block['weight'], $block['region'], $block['throttle'], $block['module'], $block['delta'], $block['theme']); + } + drupal_set_message(t('The block settings have been updated.')); + cache_clear_all(); +} + +/** + * Theme main block administration form submission. + * + * Note: the blocks are already sorted in the right order, + * grouped by status, region and weight. + */ +function theme_block_admin_display($form) { + global $theme_key; + + $throttle = module_exist('throttle'); + $block_regions = system_region_list($theme_key); + + // Highlight regions on page to provide visual reference. + foreach ($block_regions as $key => $value) { + drupal_set_content($key, '
              ' . $value . '
              '); + } + + // Build rows + $rows = array(); + $last_region = ''; + $last_status = 1; + foreach (element_children($form) as $i) { + $block = $form[$i]; + // Only take form elements that are blocks. + if (is_array($block['info'])) { + // Fetch values + $region = $block['region']['#default_value']; + $status = $block['status']['#default_value']; + + // Output region header + if ($status && $region != $last_region) { + $region_title = t('%region', array('%region' => drupal_ucfirst($block_regions[$region]))); + $rows[] = array(array('data' => $region_title, 'class' => 'region', 'colspan' => ($throttle ? 7 : 6))); + $last_region = $region; + } + // Output disabled header + elseif ($status != $last_status) { + $rows[] = array(array('data' => t('Disabled'), 'class' => 'region', 'colspan' => ($throttle ? 7 : 6))); + $last_status = $status; + } + + // Generate block row + $row = array( + array('data' => form_render($block['info']), 'class' => 'block'), + form_render($block['status']) . form_render($block['theme']), + form_render($block['weight']), + form_render($block['region']) + ); + if ($throttle) { + $row[] = form_render($block['throttle']); + } + $row[] = form_render($block['configure']); + $row[] = $block['delete'] ? form_render($block['delete']) : ''; + $rows[] = $row; + } + } + + // Finish table + $header = array(t('Block'), t('Enabled'), t('Weight'), t('Placement')); + if ($throttle) { + $header[] = t('Throttle'); + } + $header[] = array('data' => t('Operations'), 'colspan' => 2); + + $output = theme('table', $header, $rows, array('id' => 'blocks')); + $output .= form_render($form['submit']); + // Also render the form_id as there is no form_render($form) call (as form_render does not appear to handle the + // multi-dimensional block form array very well). + $output .= form_render($form['form_id']); + + return $output; +} + +function block_box_get($bid) { + return db_fetch_array(db_query('SELECT * FROM {boxes} WHERE bid = %d', $bid)); +} + +/** + * Menu callback; displays the block configuration form. + */ +function block_admin_configure($module = NULL, $delta = 0) { + + $form['module'] = array('#type' => 'value', '#value' => $module); + $form['delta'] = array('#type' => 'value', '#value' => $delta); + + $edit = db_fetch_array(db_query("SELECT pages, visibility, custom FROM {blocks} WHERE module = '%s' AND delta = '%s'", $module, $delta)); + + // Module-specific block configurations. + if ($settings = module_invoke($module, 'block', 'configure', $delta)) { + $form['block_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Block specific settings'), + '#collapsible' => true, + ); + + foreach ($settings as $k => $v) { + $form['block_settings'][$k] = $v; + } + } + + // Get the block subject for the page title. + $info = module_invoke($module, 'block', 'list'); + drupal_set_title(t("'%name' block", array('%name' => $info[$delta]['info']))); + + // Standard block configurations. + + $form['user_vis_settings'] = array( + '#type' => 'fieldset', + '#title' => t('User specific visibility settings'), + '#collapsible' => true, + ); + $form['user_vis_settings']['custom'] = array( + '#type' => 'radios', + '#title' => t('Custom visibility settings'), + '#options' => array(t('Users cannot control whether or not they see this block.'), t('Show this block by default, but let individual users hide it.'), t('Hide this block by default but let individual users show it.')), + '#description' => t('Allow individual users to customize the visibility of this block in their account settings.'), + '#default_value' => $edit['custom'], + ); + $form['page_vis_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Page specific visibility settings'), + '#collapsible' => true, + ); + $access = user_access('use PHP for block visibility'); + + if ($edit['visibility'] == 2 && !$access) { + $form['page_vis_settings'] = array(); + $form['page_vis_settings']['visibility'] = array('#type' => 'value', '#value' => 2); + $form['page_vis_settings']['pages'] = array('#type' => 'value', '#value' => $edit['pages']); + } + else { + $options = array(t('Show on every page except the listed pages.'), t('Show on only the listed pages.')); + $description = t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are '%blog' for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => theme('placeholder', 'blog'), '%blog-wildcard' => theme('placeholder', 'blog/*'), '%front' => theme('placeholder', ''))); + + if ($access) { + $options[] = t('Show if the following PHP code returns TRUE (PHP-mode, experts only).'); + $description .= t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => theme('placeholder', ''))); + } + $form['page_vis_settings']['visibility'] = array( + '#type' => 'radios', + '#title' => t('Show block on specific pages'), + '#options' => $options, + '#default_value' => $edit['visibility'], + ); + $form['page_vis_settings']['pages'] = array( + '#type' => 'textarea', + '#title' => t('Pages'), + '#default_value' => $edit['pages'], + '#description' => $description, + ); + } + + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Save block'), + ); + + return drupal_get_form('block_admin_configure', $form); +} + +function block_admin_configure_validate($form_id, $form_values) { + if ($form_values['module'] == 'block') { + if (empty($form_values['info']) || db_num_rows(db_query("SELECT bid FROM {boxes} WHERE bid != %d AND info = '%s'", $form_values['delta'], $form_values['info']))) { + form_set_error('info', t('Please ensure that each block description is unique.')); + } + } +} + +function block_admin_configure_submit($form_id, $form_values) { + if (!form_get_errors()) { + db_query("UPDATE {blocks} SET visibility = %d, pages = '%s', custom = %d WHERE module = '%s' AND delta = '%s'", $form_values['visibility'], $form_values['pages'], $form_values['custom'], $form_values['module'], $form_values['delta']); + module_invoke($form_values['module'], 'block', 'save', $form_values['delta'], $form_values); + drupal_set_message(t('The block configuration has been saved.')); + cache_clear_all(); + return 'admin/block'; + } +} + +/** + * Menu callback; displays the block creation form. + */ +function block_box_add() { + $form = block_box_form(); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save block')); + + return drupal_get_form('block_box_add', $form); +} + +function block_box_add_validate($form_id, $form_values) { + if (empty($form_values['info']) || db_num_rows(db_query("SELECT info FROM {boxes} WHERE info = '%s'", $form_values['info']))) { + form_set_error('info', t('Please ensure that each block description is unique.')); + } +} + +function block_box_add_submit($form_id, $form_values) { + if (!form_get_errors()) { + if (block_box_save($form_values)) { + drupal_set_message(t('The block has been created.')); + return 'admin/block'; + } + } +} + +/** + * Menu callback; confirm deletion of custom blocks. + */ +function block_box_delete($bid = 0) { + $box = block_box_get($bid); + $form['info'] = array('#type' => 'hidden', '#value' => $box['info'] ? $box['info'] : $box['title']); + $form['bid'] = array('#type' => 'hidden', '#value' => $bid); + + return confirm_form('block_box_delete_confirm', $form, t('Are you sure you want to delete the block %name?', array('%name' => theme('placeholder', $box['info']))), 'admin/block', '', t('Delete'), t('Cancel')); +} + +/** + * Deletion of custom blocks. + */ +function block_box_delete_confirm_submit($form_id, $form_values) { + db_query('DELETE FROM {boxes} WHERE bid = %d', $form_values['bid']); + drupal_set_message(t('The block %name has been removed.', array('%name' => theme('placeholder', $form_values['info'])))); + cache_clear_all(); + return 'admin/block'; +}; + +function block_box_form($edit = array()) { + $form['info'] = array( + '#type' => 'textfield', + '#title' => t('Block description'), + '#default_value' => $edit['info'], + '#maxlength' => 64, + '#description' => t('A brief description of your block. Used on the block overview page.', array('%overview' => url('admin/block'))), + '#required' => TRUE, + '#weight' => -19, + ); + $form['title'] = array( + '#type' => 'textfield', + '#title' => t('Block title'), + '#default_value' => $edit['title'], + '#maxlength' => 64, + '#description' => t('The title of the block as shown to the user.'), + '#weight' => -18, + ); + $form['body_filter']['#weight'] = -17; + $form['body_filter']['body'] = array( + '#type' => 'textarea', + '#title' => t('Block body'), + '#default_value' => $edit['body'], + '#rows' => 15, + '#description' => t('The content of the block as shown to the user.'), + '#weight' => -17, + ); + $form['body_filter']['format'] = filter_form($edit['format'], -16); + + return $form; +} + +function block_box_save($edit, $delta = NULL) { + if (!filter_access($edit['format'])) { + $edit['format'] = FILTER_FORMAT_DEFAULT; + } + + if (isset($delta)) { + db_query("UPDATE {boxes} SET title = '%s', body = '%s', info = '%s', format = %d WHERE bid = %d", $edit['title'], $edit['body'], $edit['info'], $edit['format'], $delta); + } + else { + db_query("INSERT INTO {boxes} (title, body, info, format) VALUES ('%s', '%s', '%s', %d)", $edit['title'], $edit['body'], $edit['info'], $edit['format']); + } + return true; +} + +/** + * Implementation of hook_user(). + * + * Allow users to decide which custom blocks to display when they visit + * the site. + */ +function block_user($type, $edit, &$user, $category = NULL) { + switch ($type) { + case 'form': + if ($category == 'account') { + $result = db_query('SELECT * FROM {blocks} WHERE status = 1 AND custom != 0 ORDER BY weight, module, delta'); + $form['block'] = array('#type' => 'fieldset', '#title' => t('Block configuration'), '#weight' => 3, '#collapsible' => TRUE, '#tree' => TRUE); + while ($block = db_fetch_object($result)) { + $data = module_invoke($block->module, 'block', 'list'); + if ($data[$block->delta]['info']) { + $return = TRUE; + $form['block'][$block->module][$block->delta] = array('#type' => 'checkbox', '#title' => $data[$block->delta]['info'], '#default_value' => isset($user->block[$block->module][$block->delta]) ? $user->block[$block->module][$block->delta] : ($block->custom == 1)); + } + } + + if ($return) { + return $form; + } + } + + break; + case 'validate': + if (!$edit['block']) { + $edit['block'] = array(); + } + return $edit; + } +} + +/** + * Return all blocks in the specified region for the current user. + * + * @param $region + * The name of a region. + * + * @return + * An array of block objects, indexed with module_delta. + * If you are displaying your blocks in one or two sidebars, you may check + * whether this array is empty to see how many columns are going to be + * displayed. + * + * @todo + * Add a proper primary key (bid) to the blocks table so we don't have + * to mess around with this module_delta construct. + * Currently, the blocks table has no primary key defined! + */ +function block_list($region) { + global $user, $theme_key; + + static $blocks = array(); + + if (!count($blocks)) { + $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s' AND status = 1 ORDER BY region, weight, module", $theme_key); + while ($block = db_fetch_object($result)) { + if (!isset($blocks[$block->region])) { + $blocks[$block->region] = array(); + } + // Use the user's block visibility setting, if necessary + if ($block->custom != 0) { + if ($user->uid && isset($user->block[$block->module][$block->delta])) { + $enabled = $user->block[$block->module][$block->delta]; + } + else { + $enabled = ($block->custom == 1); + } + } + else { + $enabled = TRUE; + } + + // Match path if necessary + if ($block->pages) { + if ($block->visibility < 2) { + $path = drupal_get_path_alias($_GET['q']); + $regexp = '/^('. preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\($|\|)/'), array('|', '.*', '\1'. preg_quote(variable_get('site_frontpage', 'node'), '/') .'\2'), preg_quote($block->pages, '/')) .')$/'; + $page_match = !($block->visibility xor preg_match($regexp, $path)); + } + else { + $page_match = drupal_eval($block->pages); + } + } + else { + $page_match = TRUE; + } + + if ($enabled && $page_match) { + // Check the current throttle status and see if block should be displayed + // based on server load. + if (!($block->throttle && (module_invoke('throttle', 'status') > 0))) { + $array = module_invoke($block->module, 'block', 'view', $block->delta); + if (isset($array) && is_array($array)) { + foreach ($array as $k => $v) { + $block->$k = $v; + } + } + } + if (isset($block->content) && $block->content) { + $blocks[$block->region]["{$block->module}_{$block->delta}"] = $block; + } + } + } + } + // Create an empty array if there were no entries + if (!isset($blocks[$region])) { + $blocks[$region] = array(); + } + return $blocks[$region]; +} + + diff --git a/modules/blog.module b/modules/blog.module new file mode 100644 index 0000000..d0e35a8 --- /dev/null +++ b/modules/blog.module @@ -0,0 +1,305 @@ + array('name' => t('blog entry'), 'base' => 'blog')); +} + +/** + * Implementation of hook_perm(). + */ +function blog_perm() { + return array('edit own blog'); +} + +/** + * Implementation of hook_access(). + */ +function blog_access($op, $node) { + global $user; + + if ($op == 'create') { + return user_access('edit own blog') && $user->uid; + } + + if ($op == 'update' || $op == 'delete') { + if (user_access('edit own blog') && ($user->uid == $node->uid)) { + return TRUE; + } + } +} + +/** + * Implementation of hook_user(). + */ +function blog_user($type, &$edit, &$user) { + if ($type == 'view' && user_access('edit own blog', $user)) { + $items[] = array('title' => t('Blog'), + 'value' => l(t('view recent blog entries'), "blog/$user->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $user->name)))), + 'class' => 'blog', + ); + return array(t('History') => $items); + } +} + +/** + * Implementation of hook_help(). + */ +function blog_help($section) { + switch ($section) { + case 'admin/help#blog': + $output = '

              '. t('The blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. Blogs are made up of individual posts that are time stamped and are typically viewed by date as you would a diary. Blogs often contain links to webpages users have read and/or agree/disagree with.') .'

              '; + $output .= '

              '. t('The blog module adds a user blogs navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. The navigation menu has a create a blog entry link (which takes you to a submission form) and a view personal blog link (which displays your blog entries as other people will see them). The blog module also creates a recent blog posts block that can be enabled.') .'

              '; + $output .= '

              '. t('If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link next to each news item in its lists. Clicking on this takes the user to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for the user to add a comment or explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the website and from your syndicated partner sites.') .'

              '; + $output .= t('

              You can

              + +', array('%user' => url('user'), '%node-add-blog' => url('node/add/blog'), '%admin-node-configure-types-blog' => url('admin/settings/content-types/blog'), '%admin-settings-blogapi' => url('admin/settings/blogapi'), '%admin-block' => url('admin/block'))); + $output .= '

              '. t('For more information please read the configuration and customization handbook Blog page.', array('%blog' => 'http://drupal.org/handbook/modules/blog/')) .'

              '; + return $output; + case 'admin/modules#description': + return t('Enables keeping an easily and regularly updated web page or a blog.'); + case 'node/add#blog': + return t("A blog is a regularly updated journal or diary made up of individual posts shown in reversed chronological order. A blog is tightly coupled to the author so each user will have his 'own' blog."); + } +} + +/** + * Displays an RSS feed containing recent blog entries of a given user. + */ +function blog_feed_user($uid = 0) { + global $user; + + if ($uid) { + $account = user_load(array('uid' => $uid, 'status' => 1)); + } + else { + $account = $user; + } + + $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, r.teaser, n.created, u.name, u.uid FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = 'blog' AND u.uid = %d AND n.status = 1 ORDER BY n.created DESC"), $uid, 0, variable_get('feed_default_items', 10)); + $channel['title'] = $account->name ."'s blog"; + $channel['link'] = url("blog/$uid", NULL, NULL, TRUE); + $channel['description'] = $term->description; + node_feed($result, $channel); +} + +/** + * Displays an RSS feed containing recent blog entries of all users. + */ +function blog_feed_last() { + $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, r.teaser, n.created, u.name, u.uid FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, variable_get('feed_default_items', 10)); + $channel['title'] = variable_get('site_name', 'drupal') .' blogs'; + $channel['link'] = url('blog', NULL, NULL, TRUE); + $channel['description'] = $term->description; + node_feed($result, $channel); +} + +/** + * Menu callback; displays a Drupal page containing recent blog entries. + */ +function blog_page($a = NULL, $b = NULL) { + + if (is_numeric($a)) { // $a is a user ID + if ($b == 'feed') { + return blog_feed_user($a); + } + else { + return blog_page_user($a); + } + } + else if ($a == 'feed') { + return blog_feed_last(); + } + else { + return blog_page_last(); + } +} + +/** + * Displays a Drupal page containing recent blog entries of a given user. + */ +function blog_page_user($uid) { + global $user; + + $account = user_load(array((is_numeric($uid) ? 'uid' : 'name') => $uid, 'status' => 1)); + + if ($account->uid) { + drupal_set_title($title = t("%name's blog", array('%name' => $account->name))); + + if (($account->uid == $user->uid) && user_access('edit own blog')) { + $output = '
            • '. l(t('Post new blog entry.'), "node/add/blog") .'
              • '; + } + else if ($account->uid == $user->uid) { + $output = '
            • '. t('You are not allowed to post a new blog entry.') .'
              • '; + } + + if ($output) { + $output = '
                '. $output .'
              '; + } + else { + $output = ''; + } + + $result = pager_query(db_rewrite_sql("SELECT n.nid, n.sticky, n.created FROM {node} n WHERE type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC"), variable_get('default_nodes_main', 10), 0, NULL, $account->uid); + while ($node = db_fetch_object($result)) { + $output .= node_view(node_load($node->nid), 1); + } + $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); + $output .= theme('feed_icon', url("blog/$account->uid/feed")); + + drupal_add_link(array('rel' => 'alternate', + 'type' => 'application/rss+xml', + 'title' => t('RSS - %title', array('%title' => $title)), + 'href' => url("blog/$account->uid/feed"))); + return $output; + } + else { + drupal_not_found(); + } +} + +/** + * Displays a Drupal page containing recent blog entries of all users. + */ +function blog_page_last() { + global $user; + + $output = ''; + + $result = pager_query(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), variable_get('default_nodes_main', 10)); + + while ($node = db_fetch_object($result)) { + $output .= node_view(node_load($node->nid), 1); + } + $output .= theme('pager', NULL, variable_get('default_nodes_main', 10)); + $output .= theme('feed_icon', url('blog/feed')); + + drupal_add_link(array('rel' => 'alternate', + 'type' => 'application/rss+xml', + 'title' => t('RSS - blogs'), + 'href' => url("blog/feed"))); + return $output; +} + +/** + * Implementation of hook_form(). + */ +function blog_form(&$node) { + global $nid; + $iid = $_GET['iid']; + + + if (empty($node->body)) { + /* + ** If the user clicked a "blog it" link, we load the data from the + ** database and quote it in the blog: + */ + + if ($nid && $blog = node_load($nid)) { + $node->body = ''. $blog->body .' ['. l($blog->name, "node/$nid") .']'; + } + + if ($iid && $item = db_fetch_object(db_query('SELECT i.*, f.title as ftitle, f.link as flink FROM {aggregator_item} i, {aggregator_feed} f WHERE i.iid = %d AND i.fid = f.fid', $iid))) { + $node->title = $item->title; + // Note: $item->description has been validated on aggregation. + $node->body = ''. check_plain($item->title) .' - '. $item->description .' ['. check_plain($item->ftitle) ."]\n"; + } + + } + + $form['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#required' => TRUE, '#default_value' => $node->title, '#weight' => -5); + $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#default_value' => $node->body, '#rows' => 20, '#required' => TRUE); + $form['body_filter']['filter'] = filter_form($node->format); + return $form; +} + +/** + * Implementation of hook_view(). + */ +function blog_view(&$node, $teaser = FALSE, $page = FALSE) { + if ($page) { + // Breadcrumb navigation + $breadcrumb[] = array('path' => 'blog', 'title' => t('blogs')); + $breadcrumb[] = array('path' => 'blog/'. $node->uid, 'title' => t("%name's blog", array('%name' => $node->name))); + $breadcrumb[] = array('path' => 'node/'. $node->nid); + menu_set_location($breadcrumb); + } + $node = node_prepare($node, $teaser); +} + +/** + * Implementation of hook_link(). + */ +function blog_link($type, $node = 0, $main = 0) { + $links = array(); + + if ($type == 'node' && $node->type == 'blog') { + if (arg(0) != 'blog' || arg(1) != $node->uid) { + $links[] = l(t("%username's blog", array('%username' => $node->name)), "blog/$node->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name)))); + } + } + + return $links; +} + +/** + * Implementation of hook_menu(). + */ +function blog_menu($may_cache) { + global $user; + $items = array(); + + if ($may_cache) { + $items[] = array('path' => 'node/add/blog', 'title' => t('blog entry'), + 'access' => user_access('edit own blog')); + $items[] = array('path' => 'blog', 'title' => t('blogs'), + 'callback' => 'blog_page', + 'access' => user_access('access content'), + 'type' => MENU_SUGGESTED_ITEM); + $items[] = array('path' => 'blog/'. $user->uid, 'title' => t('my blog'), + 'access' => user_access('edit own blog'), + 'type' => MENU_DYNAMIC_ITEM); + } + + return $items; +} + +/** + * Implementation of hook_block(). + * + * Displays the most recent 10 blog titles. + */ +function blog_block($op = 'list', $delta = 0) { + global $user; + if ($op == 'list') { + $block[0]['info'] = t('Recent blog posts'); + return $block; + } + else if ($op == 'view') { + if (user_access('access content')) { + $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10); + if (db_num_rows($result)) { + $block['content'] = node_title_list($result); + $block['content'] .= '
              '. l(t('more'), 'blog', array('title' => t('Read the latest blog entries.'))) .'
              '; + $block['subject'] = t('Recent blog posts'); + return $block; + } + } + } +} + + diff --git a/modules/blogapi.module b/modules/blogapi.module new file mode 100644 index 0000000..59d641d --- /dev/null +++ b/modules/blogapi.module @@ -0,0 +1,737 @@ +'. t('The blog API module enables a post to be posted to a site via external GUI applications. Many users prefer to use external tools to improve their ability to read and post responses in a customized way. The blog api provides users the freedom to use the blogging tools they want but still have the blogging server of choice.') .'

              '; + $output .= '

              '. t('When this module is enabled and configured you can use programs like Ecto to create and publish posts from your desktop. Blog API module supports several XML-RPC based blogging APIs such as the Blogger API, MetaWeblog API, and most of the Movable Type API. Any desktop blogging tools or other services (e.g. Flickr\'s "post to blog") that support these APIs should work with this site.', array('%external-http-ecto-kung-foo-tv' => 'http://ecto.kung-foo.tv/', '%-' => url('http://www.blogger.com/developers/api/1_docs/'), '%external-http-www-xmlrpc-com-metaWeblogApi' => 'http://www.xmlrpc.com/metaWeblogApi', '%external-http-www-movabletype-org-docs-mtmanual_programmatic-html' => 'http://www.movabletype.org/docs/mtmanual_programmatic.html', '%external-http-www-flickr-com' => 'http://www.flickr.com')) .'

              '; + $output .= '

              '. t('This module also allows site administrators to configure which content types can be posted via the external applications. So, for instance, users can post forum topics as well as blog posts. Where supported, the external applications will display each content type as a separate "blog".') .'

              '; + $output .= t('

              You can

              + +', array('%file-xmlrpc' => 'xmlrpc.php', '%admin-settings-blogapi' => url('admin/settings/blogapi'))); + $output .= '

              '. t('For more information please read the configuration and customization handbook BlogApi page.', array('%blogapi' => 'http://drupal.org/handbook/modules/blogapi/')) .'

              '; + return $output; + case 'admin/modules#description': + return t('Allows users to post content using applications that support XML-RPC blog APIs.'); + } +} + +/** + * Implementation of hook_xmlrpc(). + */ +function blogapi_xmlrpc() { + return array( + array( + 'blogger.getUsersBlogs', + 'blogapi_blogger_get_users_blogs', + array('array', 'string', 'string', 'string'), + t('Returns a list of weblogs to which an author has posting privileges.')), + array( + 'blogger.getUserInfo', + 'blogapi_blogger_get_user_info', + array('struct', 'string', 'string', 'string'), + t('Returns information about an author in the system.')), + array( + 'blogger.newPost', + 'blogapi_blogger_new_post', + array('string', 'string', 'string', 'string', 'string', 'string', 'boolean'), + t('Creates a new post, and optionally publishes it.')), + array( + 'blogger.editPost', + 'blogapi_blogger_edit_post', + array('boolean', 'string', 'string', 'string', 'string', 'string', 'boolean'), + t('Updates the information about an existing post.')), + array( + 'blogger.getPost', + 'blogapi_blogger_get_post', + array('struct', 'string', 'string', 'string', 'string'), + t('Returns information about a specific post.')), + array( + 'blogger.deletePost', + 'blogapi_blogger_delete_post', + array('boolean', 'string', 'string', 'string', 'string', 'boolean'), + t('Deletes a post.')), + array( + 'blogger.getRecentPosts', + 'blogapi_blogger_get_recent_posts', + array('array', 'string', 'string', 'string', 'string', 'int'), + t('Returns a list of the most recent posts in the system.')), + array( + 'metaWeblog.newPost', + 'blogapi_metaweblog_new_post', + array('string', 'string', 'string', 'string', 'struct', 'boolean'), + t('Creates a new post, and optionally publishes it.')), + array( + 'metaWeblog.editPost', + 'blogapi_metaweblog_edit_post', + array('boolean', 'string', 'string', 'string', 'struct', 'boolean'), + t('Updates information about an existing post.')), + array( + 'metaWeblog.getPost', + 'blogapi_metaweblog_get_post', + array('struct', 'string', 'string', 'string'), + t('Returns information about a specific post.')), + array( + 'metaWeblog.newMediaObject', + 'blogapi_metaweblog_new_media_object', + array('string', 'string', 'string', 'string', 'struct'), + t('Uploads a file to your webserver.')), + array( + 'metaWeblog.getCategories', + 'blogapi_metaweblog_get_category_list', + array('struct', 'string', 'string', 'string'), + t('Returns a list of all categories to which the post is assigned.')), + array( + 'metaWeblog.getRecentPosts', + 'blogapi_metaweblog_get_recent_posts', + array('array', 'string', 'string', 'string', 'int'), + t('Returns a list of the most recent posts in the system.')), + array( + 'mt.getRecentPostTitles', + 'blogapi_mt_get_recent_post_titles', + array('array', 'string', 'string', 'string', 'int'), + t('Returns a bandwidth-friendly list of the most recent posts in the system.')), + array( + 'mt.getCategoryList', + 'blogapi_mt_get_category_list', + array('array', 'string', 'string', 'string'), + t('Returns a list of all categories defined in the weblog.')), + array( + 'mt.getPostCategories', + 'blogapi_mt_get_post_categories', + array('array', 'string', 'string', 'string'), + t('Returns a list of all categories to which the post is assigned.')), + array( + 'mt.setPostCategories', + 'blogapi_mt_set_post_categories', + array('boolean', 'string', 'string', 'string', 'array'), + t('Sets the categories for a post.')), + array( + 'mt.supportedMethods', + 'xmlrpc_server_list_methods', + array('array'), + t('Retrieve information about the XML-RPC methods supported by the server.')), + array( + 'mt.supportedTextFilters', + 'blogapi_mt_supported_text_filters', + array('array'), + t('Retrieve information about the text formatting plugins supported by the server.')), + array( + 'mt.getTrackbackPings', + 'blogapi_mt_get_trackback_pings', + array('array', 'string'), + t('Retrieve the list of TrackBack pings posted to a particular entry. This could be used to programmatically retrieve the list of pings for a particular entry, then iterate through each of those pings doing the same, until one has built up a graph of the web of entries referencing one another on a particular topic.')), + array( + 'mt.publishPost', + 'blogap_mti_publish_post', + array('boolean', 'string', 'string', 'string'), + t('Publish (rebuild) all of the static files related to an entry from your weblog. Equivalent to saving an entry in the system (but without the ping).'))); +} + +/** + * Blogging API callback. Finds the URL of a user's blog. + */ + +function blogapi_blogger_get_users_blogs($appid, $username, $password) { + + $user = blogapi_validate_user($username, $password); + if ($user->uid) { + $types = _blogapi_get_node_types(); + $structs = array(); + foreach ($types as $type) { + $structs[] = array('url' => url('blog/' . $user->uid, NULL, NULL, true), 'blogid' => $type, 'blogName' => $user->name . ": " . $type); + } + return $structs; + } + else { + return blogapi_error($user); + } +} + +/** + * Blogging API callback. Returns profile information about a user. + */ +function blogapi_blogger_get_user_info($appkey, $username, $password) { + $user = blogapi_validate_user($username, $password); + + if ($user->uid) { + $name = explode(' ', $user->realname ? $user->realname : $user->name, 2); + return array( + 'userid' => $user->uid, + 'lastname' => $name[1], + 'firstname' => $name[0], + 'nickname' => $user->name, + 'email' => $user->mail, + 'url' => url('blog/' . $user->uid, NULL, NULL, true)); + } + else { + return blogapi_error($user); + } +} + +/** + * Blogging API callback. Inserts a new blog post as a node. + */ +function blogapi_blogger_new_post($appkey, $blogid, $username, $password, $content, $publish) { + $user = blogapi_validate_user($username, $password); + if (!$user->uid) { + return blogapi_error($user); + } + + $edit = array(); + $edit['type'] = _blogapi_blogid($blogid); + // get the node type defaults + $node_type_default = variable_get('node_options_'. $edit['type'], array('status', 'promote')); + $edit['uid'] = $user->uid; + $edit['name'] = $user->name; + $edit['promote'] = in_array('promote', $node_type_default); + $edit['comment'] = variable_get('comment_'. $edit['type'], 2); + $edit['moderate'] = in_array('moderate', $node_type_default); + $edit['revision'] = in_array('revision', $node_type_default); + $edit['format'] = FILTER_FORMAT_DEFAULT; + $edit['status'] = $publish; + + // check for bloggerAPI vs. metaWeblogAPI + if (is_array($content)) { + $edit['title'] = $content['title']; + $edit['body'] = $content['description']; + _blogapi_mt_extra($edit, $content); + } + else { + $edit['title'] = blogapi_blogger_title($content); + $edit['body'] = $content; + } + + if (!node_access('create', $edit['type'])) { + return blogapi_error(t('You do not have permission to create the type of post you wanted to create.')); + } + + if (user_access('administer nodes') && !isset($edit['date'])) { + $edit['date'] = format_date(time(), 'custom', 'Y-m-d H:i:s O'); + } + + node_validate($edit); + if ($errors = form_get_errors()) { + return blogapi_error(implode("\n", $errors)); + } + + $node = node_submit($edit); + node_save($node); + if ($node->nid) { + watchdog('content', t('%type: added %title using blog API.', array('%type' => ''. t($node->type) .'', '%title' => theme('placeholder', $node->title))), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid")); + // blogger.newPost returns a string so we cast the nid to a string by putting it in double quotes: + return "$node->nid"; + } + + return blogapi_error(t('Error storing post.')); +} + +/** + * Blogging API callback. Modifies the specified blog node. + */ +function blogapi_blogger_edit_post($appkey, $postid, $username, $password, $content, $publish) { + + $user = blogapi_validate_user($username, $password); + + if (!$user->uid) { + return blogapi_error($user); + } + + $node = node_load($postid); + if (!$node) { + return blogapi_error(message_na()); + } + // Let the teaser be re-generated. + unset($node->teaser); + + if (!node_access('update', $node)) { + return blogapi_error(t('You do not have permission to update this post.')); + } + + $node->status = $publish; + + // check for bloggerAPI vs. metaWeblogAPI + if (is_array($content)) { + $node->title = $content['title']; + $node->body = $content['description']; + _blogapi_mt_extra($node, $content); + } + else { + $node->title = blogapi_blogger_title($content); + $node->body = $content; + } + + node_validate($node); + if ($errors = form_get_errors()) { + return blogapi_error(implode("\n", $errors)); + } + + if (user_access('administer nodes') && !isset($edit['date'])) { + $node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O'); + } + $node = node_submit($node); + node_save($node); + if ($node->nid) { + watchdog('content', t('%type: updated %title using blog API.', array('%type' => ''. t($node->type) .'', '%title' => theme('placeholder', $node->title))), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid")); + return true; + } + + return blogapi_error(t('Error storing post.')); +} + +/** + * Blogging API callback. Returns a specified blog node. + */ +function blogapi_blogger_get_post($appkey, $postid, $username, $password) { + $user = blogapi_validate_user($username, $password); + if (!$user->uid) { + return blogapi_error($user); + } + + $node = node_load($postid); + + return _blogapi_get_post($node, true); +} + +/** + * Blogging API callback. Removes the specified blog node. + */ +function blogapi_blogger_delete_post($appkey, $postid, $username, $password, $publish) { + $user = blogapi_validate_user($username, $password); + if (!$user->uid) { + return blogapi_error($user); + } + + node_delete($postid); + return true; +} + +/** + * Blogging API callback. Returns the latest few postings in a user's blog. $bodies TRUE + * + * returns a bandwidth-friendly list. + */ +function blogapi_blogger_get_recent_posts($appkey, $blogid, $username, $password, $number_of_posts, $bodies = TRUE) { + // Remove unused appkey (from bloggerAPI). + $user = blogapi_validate_user($username, $password); + if (!$user->uid) { + return blogapi_error($user); + } + + $type = _blogapi_blogid($blogid); + if ($bodies) { + $result = db_query_range("SELECT n.nid, n.title, r.body, n.created, u.name FROM {node} n, {node_revisions} r, {users} u WHERE n.uid = u.uid AND n.vid = r.vid AND n.type = '%s' AND n.uid = %d ORDER BY n.created DESC", $type, $user->uid, 0, $number_of_posts); + } + else { + $result = db_query_range("SELECT n.nid, n.title, n.created, u.name FROM {node} n, {users} u WHERE n.uid = u.uid AND n.type = '%s' AND n.uid = %d ORDER BY n.created DESC", $type, $user->uid, 0, $number_of_posts); + } + $blogs = array (); + while ($blog = db_fetch_object($result)) { + $blogs[] = _blogapi_get_post($blog, $bodies); + } + return $blogs; +} + +function blogapi_metaweblog_new_post($blogid, $username, $password, $content, $publish) { + return blogapi_blogger_new_post('0123456789ABCDEF', $blogid, $username, $password, $content, $publish); +} + +function blogapi_metaweblog_edit_post($postid, $username, $password, $content, $publish) { + return blogapi_blogger_edit_post('0123456789ABCDEF', $postid, $username, $password, $content, $publish); +} + +function blogapi_metaweblog_get_post($postid, $username, $password) { + return blogapi_blogger_get_post('01234567890ABCDEF', $postid, $username, $password); +} + +/** + * Blogging API callback. Inserts a file into Drupal. + */ +function blogapi_metaweblog_new_media_object($blogid, $username, $password, $file) { + $user = blogapi_validate_user($username, $password); + if (!$user->uid) { + return blogapi_error($user); + } + + $name = basename($file['name']); + $data = $file['bits']; + + if (!$data) { + return blogapi_error(t('No file sent.')); + } + + if (!$file = file_save_data($data, $name)) { + return blogapi_error(t('Error storing file.')); + } + + // Return the successful result. + return array('url' => file_create_url($file), 'struct'); +} +/** + * Blogging API callback. Returns a list of the taxonomy terms that can be + * associated with a blog node. + */ +function blogapi_metaweblog_get_category_list($blogid, $username, $password) { + $type = _blogapi_blogid($blogid); + $vocabularies = module_invoke('taxonomy', 'get_vocabularies', $type, 'vid'); + $categories = array(); + if ($vocabularies) { + foreach ($vocabularies as $vocabulary) { + $terms = module_invoke('taxonomy', 'get_tree', $vocabulary->vid, 0, -1); + foreach ($terms as $term) { + $term_name = $term->name; + foreach (module_invoke('taxonomy', 'get_parents', $term->tid, 'tid') as $parent) { + $term_name = $parent->name . '/' . $term_name; + } + $categories[] = array('categoryName' => $term_name, 'categoryId' => $term->tid); + } + } + } + return $categories; +} + +function blogapi_metaweblog_get_recent_posts($blogid, $username, $password, $number_of_posts) { + return blogapi_blogger_get_recent_posts('0123456789ABCDEF', $blogid, $username, $password, $number_of_posts, TRUE); +} + +// see above +function blogapi_mt_get_recent_post_titles($blogid, $username, $password, $number_of_posts) { + return blogapi_blogger_get_recent_posts('0123456789ABCDEF', $blogid, $username, $password, $number_of_posts, FALSE); +} + +/* **** */ +function blogapi_mt_get_category_list($blogid, $username, $password) { + return blogapi_metaweblog_get_category_list($blogid, $username, $password); +} + +/** + * Blogging API callback. Returns a list of the taxonomy terms that are + * assigned to a particular node. + */ +function blogapi_mt_get_post_categories($postid, $username, $password) { + $user = blogapi_validate_user($username, $password); + if (!$user->uid) { + return blogapi_error($user); + } + + $terms = module_invoke('taxonomy', 'node_get_terms', $postid, 'tid'); + $categories = array(); + foreach ($terms as $term) { + $term_name = $term->name; + foreach (module_invoke('taxonomy', 'get_parents', $term->tid, 'tid') as $parent) { + $term_name = $parent->name . '/' . $term_name; + } + $categories[] = array('categoryName' => $term_name, 'categoryId' => $term->tid, 'isPrimary' => true); + } + return $categories; +} + +/** + * Blogging API callback. Assigns taxonomy terms to a particular node. + */ +function blogapi_mt_set_post_categories($postid, $username, $password, $categories) { + $user = blogapi_validate_user($username, $password); + if (!$user->uid) { + return blogapi_error($user); + } + + $node = node_load($postid); + $node->taxonomy = array(); + foreach ($categories as $category) { + $node->taxonomy[] = $category['categoryId']; + } + node_save($node); + return TRUE; +} + +/** + * Blogging API callback. Sends a list of available input formats. + */ +function blogapi_mt_supported_text_filters() { + // NOTE: we're only using anonymous' formats because the MT spec + // does not allow for per-user formats. + $formats = filter_formats(); + + $filters = array(); + foreach ($formats as $format) { + $filter['key'] = $format->format; + $filter['label'] = $format->name; + $filters[] = $filter; + } + + return $filters; +} + +/** + * Blogging API callback. Can not be implemented without support from + * trackback module. + */ +function blogapi_mt_get_trackback_pings() { + return blogapi_error(t('Not implemented.')); +} + +/** + * Blogging API callback. Publishes the given node + */ +function blogap_mti_publish_post($postid, $username, $password) { + $user = blogapi_validate_user($username, $password); + if (!$user->uid) { + return blogapi_error($user); + } + $node = node_load($postid); + if (!$node) { + return blogapi_error(t('Invalid post.')); + } + + $node->status = 1; + if (!node_access('update', $node)) { + return blogapi_error(t('You do not have permission to update this post.')); + } + + node_save($node); + + return true; +} + +/** + * Prepare an error message for returning to the XMLRPC caller. + */ +function blogapi_error($message) { + static $xmlrpcusererr; + if (!is_array($message)) { + $message = array($message); + } + + $message = implode(' ', $message); + + return xmlrpc_error($xmlrpcusererr + 1, strip_tags($message)); +} + +/** + * Ensure that the given user has permission to edit a blog. + */ +function blogapi_validate_user($username, $password) { + global $user; + + $user = user_authenticate($username, $password); + + if ($user->uid) { + if (user_access('edit own blog', $user)) { + return $user; + } + else { + return t("You either tried to edit somebody else's blog or you don't have permission to edit your own blog."); + } + } + else { + return t('Wrong username or password.'); + } +} + +/** + * For the blogger API, extract the node title from the contents field. + */ +function blogapi_blogger_title(&$contents) { + if (eregi('([^<]*)', $contents, $title)) { + $title = strip_tags($title[0]); + $contents = ereg_replace('[^<]*', '', $contents); + } + else { + list($title, $contents) = explode("\n", $contents, 2); + } + return $title; +} + +function blogapi_settings() { + $form['blogapi_engine'] = array( + '#type' => 'select', '#title' => t('XML-RPC Engine'), '#default_value' => variable_get('blogapi_engine', 0), + '#options' => array(0 => 'Blogger', 1 => 'MetaWeblog', 2 => 'Movabletype'), + '#description' => t('RSD or Really-Simple-Discovery is a mechanism which allows external blogger tools to discover the APIs they can use to interact with Drupal. Here you can set the preferred method for blogger tools to interact with your site. The common XML-RPC engines are Blogger, MetaWeblog and Movabletype. If you are not sure which is the correct setting, choose Blogger.') + ); + + $node_types = node_get_types(); + $defaults = isset($node_types['blog']) ? array('blog' => 1) : array(); + $form['blogapi_node_types'] = array( + '#type' => 'checkboxes', '#title' => t('Blog types'), '#required' => TRUE, + '#default_value' => variable_get('blogapi_node_types', $defaults), '#options' => $node_types, + '#description' => t('Select the content types for which you wish to enable posting via blogapi. Each type will appear as a different "blog" in the client application (if supported).') + ); + + return $form; +} + +function blogapi_menu($may_cache) { + $items = array(); + + if (drupal_is_front_page()) { + drupal_add_link(array('rel' => 'EditURI', + 'type' => 'application/rsd+xml', + 'title' => t('RSD'), + 'href' => url('blogapi/rsd', NULL, NULL, TRUE))); + } + + if ($may_cache) { + $items[] = array('path' => 'blogapi', 'title' => t('RSD'), 'callback' => 'blogapi_blogapi', 'access' => user_access('access content'), 'type' => MENU_CALLBACK); + } + + return $items; +} + +function blogapi_blogapi() { + switch (arg(1)) { + case 'rsd': + blogapi_rsd(); + break; + default: + drupal_not_found(); + break; + } +} + +function blogapi_rsd() { + global $base_url; + + $xmlrpc = $base_url .'/'. 'xmlrpc.php'; + $base = url('', NULL, NULL, TRUE); + $blogid = 1; # until we figure out how to handle multiple bloggers + + drupal_set_header('Content-Type: application/rsd+xml; charset=utf-8'); + print <<<__RSD__ + + + + Drupal + http://drupal.org/ + $base + + + + + + + +__RSD__; +} + +/** + * Handles extra information sent by clients according to MovableType's spec. + */ +function _blogapi_mt_extra(&$node, $struct) { + if (is_array($node)) { + $was_array = true; + $node = (object)$node; + } + + // mt_allow_comments + if (array_key_exists('mt_allow_comments', $struct)) { + switch ($struct['mt_allow_comments']) { + case 0: + $node->comment = COMMENT_NODE_DISABLED; + break; + case 1: + $node->comment = COMMENT_NODE_READ_WRITE; + break; + case 2: + $node->comment = COMMENT_NODE_READ_ONLY; + break; + } + } + + // merge the 3 body sections (description, mt_excerpt, mt_text_more) into + // one body + if ($struct['mt_excerpt']) { + $node->body = $struct['mt_excerpt'] .''.$node->body; + } + if ($struct['mt_text_more']) { + $node->body = $node->body . '' . $struct['mt_text_more']; + } + + // mt_tb_ping_urls + if (function_exists('trackback_send')) { + if (is_array($struct['mt_tb_ping_urls'])) { + foreach ($struct['mt_tb_ping_urls'] as $tb_ping_url) { + $node->tb_url = $tb_ping_url->getVal(); + trackback_send($node); + unset($node->tb_url); // make sure we don't ping twice + } + } + else { + $node->tb_url = $struct['mt_tb_ping_urls']; + } + } + + // mt_convert_breaks + if ($struct['mt_convert_breaks']) { + $node->format = $struct['mt_convert_breaks']; + } + + // dateCreated + if ($struct['dateCreated']) { + $node->date = format_date(mktime($struct['dateCreated']->hour, $struct['dateCreated']->minute, $struct['dateCreated']->second, $struct['dateCreated']->month, $struct['dateCreated']->day, $struct['dateCreated']->year), 'custom', 'Y-m-d H:i:s O'); + } + + if ($was_array) { + $node = (array)$node; + } +} + +function _blogapi_get_post($node, $bodies = true) { + $xmlrpcval = array ( + 'userid' => $node->name, + 'dateCreated' => xmlrpc_date($node->created), + 'title' => $node->title, + 'postid' => $node->nid, + 'link' => url('node/'.$node->nid, NULL, NULL, true), + 'permaLink' => url('node/'.$node->nid, NULL, NULL, true), + ); + if ($bodies) { + if ($node->comment = 1) { + $comment = 2; + } + if ($node->comment = 2) { + $comment = 1; + } + + $xmlrpcval['content'] = "$node->title$node->body"; + $xmlrpcval['description'] = $node->body; + // Add MT specific fields + $xmlrpcval['mt_allow_comments'] = $comment; + $xmlrpcval['mt_convert_breaks'] = $node->format; + } + + return $xmlrpcval; +} + +function _blogapi_blogid($id) { + if (is_numeric($id)) { + return 'blog'; + } + else { + return $id; + } +} + +function _blogapi_get_node_types() { + $available_types = array_keys(array_filter(variable_get('blogapi_node_types', array('blog' => 1)))); + $types = array(); + foreach (node_get_types() as $type => $name) { + if (node_access('create', $type) && in_array($type, $available_types)) { + $types[] = $type; + } + } + + return $types; +} + diff --git a/modules/book.module b/modules/book.module new file mode 100644 index 0000000..1667b92 --- /dev/null +++ b/modules/book.module @@ -0,0 +1,1026 @@ + array('name' => t('book page'), 'base' => 'book')); +} + +/** + * Implementation of hook_perm(). + */ +function book_perm() { + return array('outline posts in books', 'create book pages', 'create new books', 'edit book pages', 'edit own book pages', 'see printer-friendly version'); +} + +/** + * Implementation of hook_access(). + */ +function book_access($op, $node) { + global $user; + + if ($op == 'create') { + // Only registered users can create book pages. Given the nature + // of the book module this is considered to be a good/safe idea. + return user_access('create book pages'); + } + + if ($op == 'update') { + // Only registered users can update book pages. Given the nature + // of the book module this is considered to be a good/safe idea. + // One can only update a book page if there are no suggested updates + // of that page waiting for approval. That is, only updates that + // don't overwrite the current or pending information are allowed. + + if ((user_access('edit book pages') && !$node->moderate) || ($node->uid == $user->uid && user_access('edit own book pages'))) { + return TRUE; + } + else { + // do nothing. node-access() will determine further access + } + } +} + +/** + * Implementation of hook_link(). + */ +function book_link($type, $node = 0, $main = 0) { + + $links = array(); + + if ($type == 'node' && isset($node->parent)) { + if (!$main) { + if (book_access('create', $node)) { + $links[] = l(t('add child page'), "node/add/book/parent/$node->nid"); + } + if (user_access('see printer-friendly version')) { + $links[] = l(t('printer-friendly version'), + 'book/export/html/'. $node->nid, + array('title' => t('Show a printer-friendly version of this book page and its sub-pages.'))); + } + } + } + + return $links; +} + +/** + * Implementation of hook_menu(). + */ +function book_menu($may_cache) { + $items = array(); + + if ($may_cache) { + $items[] = array( + 'path' => 'node/add/book', + 'title' => t('book page'), + 'access' => user_access('create book pages')); + $items[] = array( + 'path' => 'admin/node/book', + 'title' => t('books'), + 'callback' => 'book_admin', + 'access' => user_access('administer nodes'), + 'type' => MENU_LOCAL_TASK, + 'weight' => -1); + $items[] = array( + 'path' => 'admin/node/book/list', + 'title' => t('list'), + 'type' => MENU_DEFAULT_LOCAL_TASK); + $items[] = array( + 'path' => 'admin/node/book/orphan', + 'title' => t('orphan pages'), + 'callback' => 'book_admin_orphan', + 'type' => MENU_LOCAL_TASK, + 'weight' => 8); + $items[] = array( + 'path' => 'book', + 'title' => t('books'), + 'callback' => 'book_render', + 'access' => user_access('access content'), + 'type' => MENU_SUGGESTED_ITEM); + $items[] = array( + 'path' => 'book/export', + 'callback' => 'book_export', + 'access' => user_access('access content'), + 'type' => MENU_CALLBACK); + } + else { + // To avoid SQL overhead, check whether we are on a node page and whether the + // user is allowed to outline posts in books. + if (arg(0) == 'node' && is_numeric(arg(1)) && user_access('outline posts in books')) { + // Only add the outline-tab for non-book pages: + $result = db_query(db_rewrite_sql("SELECT n.nid FROM {node} n WHERE n.nid = %d AND n.type != 'book'"), arg(1)); + if (db_num_rows($result) > 0) { + $items[] = array( + 'path' => 'node/'. arg(1) .'/outline', + 'title' => t('outline'), + 'callback' => 'book_outline', + 'callback arguments' => array(arg(1)), + 'access' => user_access('outline posts in books'), + 'type' => MENU_LOCAL_TASK, + 'weight' => 2); + } + } + } + + return $items; +} + +/** + * Implementation of hook_block(). + * + * Displays the book table of contents in a block when the current page is a + * single-node view of a book node. + */ +function book_block($op = 'list', $delta = 0) { + $block = array(); + if ($op == 'list') { + $block[0]['info'] = t('Book navigation'); + return $block; + } + else if ($op == 'view') { + // Only display this block when the user is browsing a book: + if (arg(0) == 'node' && is_numeric(arg(1))) { + $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d'), arg(1)); + if (db_num_rows($result) > 0) { + $node = db_fetch_object($result); + + $path = book_location($node); + $path[] = $node; + + $expand = array(); + foreach ($path as $key => $node) { + $expand[] = $node->nid; + } + + $block['subject'] = check_plain($path[0]->title); + $block['content'] = book_tree($expand[0], 5, $expand); + } + } + + return $block; + } +} + +/** + * Implementation of hook_load(). + */ +function book_load($node) { + $book = db_fetch_object(db_query('SELECT * FROM {book} WHERE vid = %d', $node->vid)); + return $book; +} + +/** + * Implementation of hook_insert(). + */ +function book_insert($node) { + db_query("INSERT INTO {book} (nid, vid, parent, weight) VALUES (%d, %d, %d, %d)", $node->nid, $node->vid, $node->parent, $node->weight); +} + +/** + * Implementation of hook_update(). + */ +function book_update($node) { + if ($node->revision) { + db_query("INSERT INTO {book} (nid, vid, parent, weight) VALUES (%d, %d, %d, %d)", $node->nid, $node->vid, $node->parent, $node->weight); + } + else { + db_query("UPDATE {book} SET parent = %d, weight = %d WHERE vid = %d", $node->parent, $node->weight, $node->vid); + } +} + +/** + * Implementation of hook_delete(). + */ +function book_delete(&$node) { + db_query('DELETE FROM {book} WHERE nid = %d', $node->nid); +} + +/** + * Implementation of hook_submit(). + */ +function book_submit(&$node) { + global $user; + // Set default values for non-administrators. + if (!user_access('administer nodes')) { + $node->weight = 0; + $node->revision = 1; + $book->uid = $user->uid; + $book->name = $user->uid ? $user->name : ''; + } +} + +/** + * Implementation of hook_form(). + */ +function book_form(&$node) { + if ($node->nid && !$node->parent && !user_access('create new books')) { + $form['parent'] = array('#type' => 'value', '#value' => $node->parent); + } + else { + $form['parent'] = array('#type' => 'select', + '#title' => t('Parent'), + '#default_value' => ($node->parent ? $node->parent : arg(4)), + '#options' => book_toc($node->nid), + '#weight' => -4, + '#description' => user_access('create new books') ? t('The parent section in which to place this page. Note that each page whose parent is <top-level> is an independent, top-level book.') : t('The parent that this page belongs in.'), + ); + } + + $form['title'] = array('#type' => 'textfield', + '#title' => t('Title'), + '#required' => TRUE, + '#default_value' => $node->title, + '#weight' => -5, + ); + $form['body_filter']['body'] = array('#type' => 'textarea', + '#title' => t('Body'), + '#default_value' => $node->body, + '#rows' => 20, + '#required' => TRUE, + ); + $form['body_filter']['format'] = filter_form($node->format); + + $form['log'] = array( + '#type' => 'textarea', + '#title' => t('Log message'), + '#default_value' => $node->log, + '#weight' => 5, + '#description' => t('An explanation of the additions or updates being made to help other authors understand your motivations.'), + ); + + if (user_access('administer nodes')) { + $form['weight'] = array('#type' => 'weight', + '#title' => t('Weight'), + '#default_value' => $node->weight, + '#delta' => 15, + '#weight' => 5, + '#description' => t('Pages at a given level are ordered first by weight and then by title.'), + ); + } + else { + // If a regular user updates a book page, we create a new revision + // authored by that user: + $form['revision'] = array('#type' => 'hidden', '#value' => 1); + } + + return $form; +} + +/** + * Implementation of function book_outline() + * Handles all book outline operations. + */ +function book_outline($nid) { + $node = node_load($nid); + $page = book_load($node); + + $form['parent'] = array('#type' => 'select', + '#title' => t('Parent'), + '#default_value' => $page->parent, + '#options' => book_toc($node->nid), + '#description' => t('The parent page in the book.'), + ); + $form['weight'] = array('#type' => 'weight', + '#title' => t('Weight'), + '#default_value' => $page->weight, + '#delta' => 15, + '#description' => t('Pages at a given level are ordered first by weight and then by title.'), + ); + $form['log'] = array('#type' => 'textarea', + '#title' => t('Log message'), + '#default_value' => $node->log, + '#description' => t('An explanation to help other authors understand your motivations to put this post into the book.'), + ); + + $form['nid'] = array('#type' => 'value', '#value' => $nid); + if ($page->nid) { + $form['update'] = array('#type' => 'submit', + '#value' => t('Update book outline'), + ); + $form['remove'] = array('#type' => 'submit', + '#value' => t('Remove from book outline'), + ); + } + else { + $form['add'] = array('#type' => 'submit', '#value' => t('Add to book outline')); + } + + drupal_set_title(check_plain($node->title)); + return drupal_get_form('book_outline', $form); +} + +/** + * Handles book outline form submissions. + */ +function book_outline_submit($form_id, $form_values) { + $op = $_POST['op']; + $node = node_load($form_values['nid']); + + switch ($op) { + case t('Add to book outline'): + db_query('INSERT INTO {book} (nid, vid, parent, weight) VALUES (%d, %d, %d, %d)', $node->nid, $node->vid, $form_values['parent'], $form_values['weight']); + db_query("UPDATE {node_revisions} SET log = '%s' WHERE vid = %d", $form_values['log'], $node->vid); + drupal_set_message(t('The post has been added to the book.')); + break; + case t('Update book outline'): + db_query('UPDATE {book} SET parent = %d, weight = %d WHERE vid = %d', $form_values['parent'], $form_values['weight'], $node->vid); + db_query("UPDATE {node_revisions} SET log = '%s' WHERE vid = %d", $form_values['log'], $node->vid); + drupal_set_message(t('The book outline has been updated.')); + break; + case t('Remove from book outline'): + db_query('DELETE FROM {book} WHERE nid = %d', $node->nid); + drupal_set_message(t('The post has been removed from the book.')); + break; + } + return "node/$node->nid"; +} + +/** + * 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. + * + * @param node - a book node object for which to compute the path + * + * @return - an array of book node objects representing the path of + * nodes root to parent of the given node. Returns an empty array if + * the node does not exist or is not part of a book hierarchy. + * + */ +function book_location($node, $nodes = array()) { + $parent = db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d'), $node->parent)); + if (isset($parent->title)) { + $nodes = book_location($parent, $nodes); + $nodes[] = $parent; + } + return $nodes; +} + +/** + * Accumulates the nodes up to the root of the book from the given node in the $nodes array. + */ +function book_location_down($node, $nodes = array()) { + $last_direct_child = db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND b.parent = %d ORDER BY b.weight DESC, n.title DESC'), $node->nid)); + if ($last_direct_child) { + $nodes[] = $last_direct_child; + $nodes = book_location_down($last_direct_child, $nodes); + } + return $nodes; +} + +/** + * Fetches the node object of the previous page of the book. + */ +function book_prev($node) { + // If the parent is zero, we are at the start of a book so there is no previous. + if ($node->parent == 0) { + return NULL; + } + + // Previous on the same level: + $direct_above = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = %d AND n.status = 1 AND n.moderate = 0 AND (b.weight < %d OR (b.weight = %d AND n.title < '%s')) ORDER BY b.weight DESC, n.title DESC"), $node->parent, $node->weight, $node->weight, $node->title)); + if ($direct_above) { + // Get last leaf of $above. + $path = book_location_down($direct_above); + + return $path ? (count($path) > 0 ? array_pop($path) : NULL) : $direct_above; + } + else { + // Direct parent: + $prev = db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d AND n.status = 1 AND n.moderate = 0'), $node->parent)); + return $prev; + } +} + +/** + * Fetches the node object of the next page of the book. + */ +function book_next($node) { + // get first direct child + $child = db_fetch_object(db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = %d AND n.status = 1 AND n.moderate = 0 ORDER BY b.weight ASC, n.title ASC'), $node->nid)); + if ($child) { + return $child; + } + + // No direct child: get next for this level or any parent in this book. + $path = book_location($node); // Path to top-level node including this one. + $path[] = $node; + + while (($leaf = array_pop($path)) && count($path)) { + $next = db_fetch_object(db_query(db_rewrite_sql("SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = %d AND n.status = 1 AND n.moderate = 0 AND (b.weight > %d OR (b.weight = %d AND n.title > '%s')) ORDER BY b.weight ASC, n.title ASC"), $leaf->parent, $leaf->weight, $leaf->weight, $leaf->title)); + if ($next) { + return $next; + } + } +} + +/** + * Returns the content of a given node. If $teaser if true, returns + * the teaser rather than full content. Displays the most recently + * approved revision of a node (if any) unless we have to display this + * page in the context of the moderation queue. + */ +function book_content($node, $teaser = FALSE) { + // Return the page body. + return node_prepare($node, $teaser); +} + +/** + * Implementation of hook_view(). + * + * If not displayed on the main page, we render the node as a page in the + * book with extra links to the previous and next pages. + */ +function book_view(&$node, $teaser = FALSE, $page = FALSE) { + $node = node_prepare($node, $teaser); +} + +/** + * Implementation of hook_nodeapi(). + * + * Appends book navigation to all nodes in the book. + */ +function book_nodeapi(&$node, $op, $teaser, $page) { + switch ($op) { + case 'view': + if (!$teaser) { + $book = db_fetch_array(db_query('SELECT * FROM {book} WHERE vid = %d', $node->vid)); + if ($book) { + if ($node->moderate && user_access('administer nodes')) { + drupal_set_message(t("The post has been submitted for moderation and won't be accessible until it has been approved.")); + } + + foreach ($book as $key => $value) { + $node->$key = $value; + } + + $path = book_location($node); + // Construct the breadcrumb: + $node->breadcrumb = array(); // Overwrite the trail with a book trail. + foreach ($path as $level) { + $node->breadcrumb[] = array('path' => 'node/'. $level->nid, 'title' => $level->title); + } + $node->breadcrumb[] = array('path' => 'node/'. $node->nid); + + $node->body .= theme('book_navigation', $node); + + if ($page) { + menu_set_location($node->breadcrumb); + } + } + } + break; + case 'delete revision': + db_query('DELETE FROM {book} WHERE vid = %d', $node->vid); + break; + case 'delete': + db_query('DELETE FROM {book} WHERE nid = %d', $node->nid); + break; + } +} + +/** + * Prepares the links to children (TOC) and forward/backward + * navigation for a node presented as a book page. + * + * @ingroup themeable + */ +function theme_book_navigation($node) { + $output = ''; + $links = ''; + + if ($node->nid) { + $tree = book_tree($node->nid); + + if ($prev = book_prev($node)) { + drupal_add_link(array('rel' => 'prev', 'href' => url('node/'. $prev->nid))); + $links .= l(t('‹ ') . $prev->title, 'node/'. $prev->nid, array('class' => 'page-previous', 'title' => t('Go to previous page'))); + } + if ($node->parent) { + drupal_add_link(array('rel' => 'up', 'href' => url('node/'. $node->parent))); + $links .= l(t('up'), 'node/'. $node->parent, array('class' => 'page-up', 'title' => t('Go to parent page'))); + } + if ($next = book_next($node)) { + drupal_add_link(array('rel' => 'next', 'href' => url('node/'. $next->nid))); + $links .= l($next->title . t(' ›'), 'node/'. $next->nid, array('class' => 'page-next', 'title' => t('Go to next page'))); + } + + if (isset($tree) || isset($links)) { + $output = '
              '; + if (isset($tree)) { + $output .= $tree; + } + if (isset($links)) { + $output .= '
              '. $links .'
              '; + } + $output .= '
              '; + } + } + + return $output; +} + +/** + * This is a helper function for book_toc(). + */ +function book_toc_recurse($nid, $indent, $toc, $children, $exclude) { + if ($children[$nid]) { + foreach ($children[$nid] as $foo => $node) { + if (!$exclude || $exclude != $node->nid) { + $toc[$node->nid] = $indent .' '. $node->title; + $toc = book_toc_recurse($node->nid, $indent .'--', $toc, $children, $exclude); + } + } + } + + return $toc; +} + +/** + * Returns an array of titles and nid entries of book pages in table of contents order. + */ +function book_toc($exclude = 0) { + $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 ORDER BY b.weight, n.title')); + + while ($node = db_fetch_object($result)) { + if (!$children[$node->parent]) { + $children[$node->parent] = array(); + } + $children[$node->parent][] = $node; + } + + $toc = array(); + // If the user has permission to create new books, add the top-level book page to the menu; + if (user_access('create new books')) { + $toc[0] = '<'. t('top-level') .'>'; + } + + $toc = book_toc_recurse(0, '', $toc, $children, $exclude); + + return $toc; +} + +/** + * This is a helper function for book_tree() + */ +function book_tree_recurse($nid, $depth, $children, $unfold = array()) { + $output = ''; + if ($depth > 0) { + if (isset($children[$nid])) { + foreach ($children[$nid] as $foo => $node) { + if (in_array($node->nid, $unfold)) { + if ($tree = book_tree_recurse($node->nid, $depth - 1, $children, $unfold)) { + $output .= '
            • '; + $output .= l($node->title, 'node/'. $node->nid); + $output .= '
                '. $tree .'
              '; + $output .= '
              • '; + } + else { + $output .= '
            • '. l($node->title, 'node/'. $node->nid) .'
              • '; + } + } + else { + if ($tree = book_tree_recurse($node->nid, 1, $children)) { + $output .= ''; + } + else { + $output .= '
            • '. l($node->title, 'node/'. $node->nid) .'
              • '; + } + } + } + } + } + + return $output; +} + +/** + * Returns an HTML nested list (wrapped in a menu-class div) representing the book nodes + * as a tree. + */ +function book_tree($parent = 0, $depth = 3, $unfold = array()) { + $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND n.moderate = 0 ORDER BY b.weight, n.title')); + + while ($node = db_fetch_object($result)) { + $list = isset($children[$node->parent]) ? $children[$node->parent] : array(); + $list[] = $node; + $children[$node->parent] = $list; + } + + if ($tree = book_tree_recurse($parent, $depth, $children, $unfold)) { + return '
                '. $tree .'
              '; + } +} + +/** + * Menu callback; prints a listing of all books. + */ +function book_render() { + $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = 0 AND n.status = 1 AND n.moderate = 0 ORDER BY b.weight, n.title')); + + $books = array(); + while ($node = db_fetch_object($result)) { + $books[] = l($node->title, 'node/'. $node->nid); + } + + return theme('item_list', $books); +} + +/** + * Menu callback; Generates various representation of a book page with + * all descendants and prints the requested representation to output. + * + * The function delegates the generation of output to helper functions. + * The function name is derived by prepending 'book_export_' to the + * given output type. So, e.g., a type of 'html' results in a call to + * the function book_export_html(). + * + * @param type + * - a string encoding the type of output requested. + * The following types are currently supported in book module + * html: HTML (printer friendly output) + * Other types are supported in contributed modules. + * @param nid + * - an integer representing the node id (nid) of the node to export + * + */ +function book_export($type = 'html', $nid = 0) { + $type = drupal_strtolower($type); + $node_result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.parent FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.nid = %d'), $nid); + if (db_num_rows($node_result) > 0) { + $node = db_fetch_object($node_result); + } + $depth = count(book_location($node)) + 1; + $export_function = 'book_export_' . $type; + + if (function_exists($export_function)) { + print call_user_func($export_function, $nid, $depth); + } + else { + drupal_set_message(t('Unknown export format.')); + drupal_not_found(); + } +} + +/** + * This function is called by book_export() to generate HTML for export. + * + * The given node is /embedded to its absolute depth in a top level + * section/. For example, a child node with depth 2 in the hierarchy + * is contained in (otherwise empty) <div> elements + * corresponding to depth 0 and depth 1. This is intended to support + * WYSIWYG output - e.g., level 3 sections always look like level 3 + * sections, no matter their depth relative to the node selected to be + * exported as printer-friendly HTML. + * + * @param nid + * - an integer representing the node id (nid) of the node to export + * @param depth + * - an integer giving the depth in the book hierarchy of the node + * which is to be exported + * + * @return + * - string containing HTML representing the node and its children in + * the book hierarchy +*/ +function book_export_html($nid, $depth) { + if (user_access('see printer-friendly version')) { + $node = node_load($nid); + for ($i = 1; $i < $depth; $i++) { + $content .= "
              \n"; + } + $content .= book_recurse($nid, $depth, 'book_node_visitor_html_pre', 'book_node_visitor_html_post'); + for ($i = 1; $i < $depth; $i++) { + $content .= "
              \n"; + } + return theme('book_export_html', check_plain($node->title), $content); + } + else { + drupal_access_denied(); + } +} + +/** + * How the book's HTML export should be themed + * + * @ingroup themeable + */ +function theme_book_export_html($title, $content) { + global $base_url; + $html = "\n"; + $html .= ''; + $html .= "\n". $title ."\n"; + $html .= ''; + $html .= '' . "\n"; + $html .= "\n"; + $html .= "\n\n". $content . "\n\n\n"; + return $html; +} + +/** + * Traverses the book tree. Applies the $visit_pre() callback to each + * node, is called recursively for each child of the node (in weight, + * title order). Finally appends the output of the $visit_post() + * callback to the output before returning the generated output. + * + * @param nid + * - the node id (nid) of the root node of the book hierarchy. + * @param depth + * - the depth of the given node in the book hierarchy. + * @param visit_pre + * - a function callback to be called upon visiting a node in the tree + * @param visit_post + * - a function callback to be called after visiting a node in the tree, + * but before recursively visiting children. + * @return + * - the output generated in visiting each node + */ +function book_recurse($nid = 0, $depth = 1, $visit_pre, $visit_post) { + $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND n.nid = %d AND n.moderate = 0 ORDER BY b.weight, n.title'), $nid); + while ($page = db_fetch_object($result)) { + // Load the node: + $node = node_load($page->nid); + + if ($node) { + if (function_exists($visit_pre)) { + $output .= call_user_func($visit_pre, $node, $depth, $nid); + } + else { + $output .= book_node_visitor_html_pre($node, $depth, $nid); + } + + $children = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE n.status = 1 AND b.parent = %d AND n.moderate = 0 ORDER BY b.weight, n.title'), $node->nid); + while ($childpage = db_fetch_object($children)) { + $childnode = node_load($childpage->nid); + if ($childnode->nid != $node->nid) { + $output .= book_recurse($childnode->nid, $depth + 1, $visit_pre, $visit_post); + } + } + if (function_exists($visit_post)) { + $output .= call_user_func($visit_post, $node, $depth); + } + else { + # default + $output .= book_node_visitor_html_post($node, $depth); + } + } + } + + return $output; +} + +/** + * Generates printer-friendly HTML for a node. This function + * is a 'pre-node' visitor function for book_recurse(). + * + * @param $node + * - the node to generate output for. + * @param $depth + * - the depth of the given node in the hierarchy. This + * is used only for generating output. + * @param $nid + * - the node id (nid) of the given node. This + * is used only for generating output. + * @return + * - the HTML generated for the given node. + */ +function book_node_visitor_html_pre($node, $depth, $nid) { + // Output the content: + if (node_hook($node, 'content')) { + $node = node_invoke($node, 'content'); + } + // Allow modules to change $node->body before viewing. + node_invoke_nodeapi($node, 'print', $node->body, false); + + $output .= "
              nid ."\" class=\"section-$depth\">\n"; + $output .= "

              ". check_plain($node->title) ."

              \n"; + + if ($node->body) { + $output .= $node->body; + } + return $output; +} + +/** + * Finishes up generation of printer-friendly HTML after visiting a + * node. This function is a 'post-node' visitor function for + * book_recurse(). + */ +function book_node_visitor_html_post($node, $depth) { + return "
              \n"; +} + +function _book_admin_table($nodes = array()) { + $form = array( + '#theme' => 'book_admin_table', + '#tree' => TRUE, + ); + + foreach ($nodes as $node) { + $form = array_merge($form, _book_admin_table_tree($node, 0)); + } + + return $form; +} + +function _book_admin_table_tree($node, $depth) { + $form = array(); + + $form[] = array( + 'nid' => array('#type' => 'value', '#value' => $node->nid), + 'depth' => array('#type' => 'value', '#value' => $depth), + 'title' => array( + '#type' => 'textfield', + '#default_value' => $node->title, + '#maxlength' => 255, + ), + 'weight' => array( + '#type' => 'weight', + '#default_value' => $node->weight, + '#delta' => 15, + ), + ); + + $children = db_query(db_rewrite_sql('SELECT n.nid, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = %d ORDER BY b.weight, n.title'), $node->nid); + while ($child = db_fetch_object($children)) { + $form = array_merge($form, _book_admin_table_tree(node_load($child->nid), $depth + 1)); + } + + return $form; +} + +function theme_book_admin_table($form) { + $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => '3')); + + $rows = array(); + foreach (element_children($form) as $key) { + $nid = $form[$key]['nid']['#value']; + $pid = $form[0]['nid']['#value']; + if ($pid == $nid) { + // Don't return to the parent book page if it is deleted. + $pid = ''; + } + $rows[] = array( + '
              '. form_render($form[$key]['title']) .'
              ', + form_render($form[$key]['weight']), + l(t('view'), 'node/'. $nid), + l(t('edit'), 'node/'. $nid .'/edit'), + l(t('delete'), 'node/'. $nid .'/delete', NULL, 'destination=admin/node/book/'. (arg(3) == 'orphan' ? 'orphan' : $pid)), + ); + } + + return theme('table', $header, $rows); +} + +/** + * Display an administrative view of the hierarchy of a book. + */ +function book_admin_edit($nid) { + $node = node_load($nid); + if ($node->nid) { + drupal_set_title(check_plain($node->title)); + $form = array(); + + $form['table'] = _book_admin_table(array($node)); + $form['save'] = array( + '#type' => 'submit', + '#value' => t('Save book pages'), + ); + + return drupal_get_form('book_admin_edit', $form); + } + else { + drupal_not_found(); + } +} + +/** + * Menu callback; displays a listing of all orphaned book pages. + */ +function book_admin_orphan() { + $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status, b.parent FROM {node} n INNER JOIN {book} b ON n.vid = b.vid')); + + $pages = array(); + while ($page = db_fetch_object($result)) { + $pages[$page->nid] = $page; + } + + $orphans = array(); + if (count($pages)) { + foreach ($pages as $page) { + if ($page->parent && empty($pages[$page->parent])) { + $orphans[] = node_load($page->nid); + } + } + } + + if (count($orphans)) { + $form = array(); + + $form['table'] = _book_admin_table($orphans); + $form['save'] = array( + '#type' => 'submit', + '#value' => t('Save book pages'), + ); + + return drupal_get_form('book_admin_edit', $form); + } + else { + return '

              '. t('There are no orphan pages.') .'

              '; + } +} + +function book_admin_edit_submit($form_id, $form_values) { + foreach ($form_values['table'] as $row) { + $node = node_load($row['nid']); + + if ($row['title'] != $node->title || $row['weight'] != $node->weight) { + $node->title = $row['title']; + $node->weight = $row['weight']; + + node_save($node); + watchdog('content', t('%type: updated %title.', array('%type' => theme('placeholder', t('book')), '%title' => theme('placeholder', $node->title))), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid)); + } + } + + if (is_numeric(arg(3))) { + // Updating pages in a single book. + $book = node_load(arg(3)); + drupal_set_message(t('Updated book %title.', array('%title' => theme('placeholder', $book->title)))); + } + else { + // Updating the orphan pages. + drupal_set_message(t('Updated orphan book pages.')); + } +} + +/** + * Menu callback; displays the book administration page. + */ +function book_admin($nid = 0) { + if ($nid) { + return book_admin_edit($nid); + } + else { + return book_admin_overview(); + } +} + +/** + * Returns an administrative overview of all books. + */ +function book_admin_overview() { + $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.vid = b.vid WHERE b.parent = 0 ORDER BY b.weight, n.title')); + while ($book = db_fetch_object($result)) { + $rows[] = array(l($book->title, "node/$book->nid"), l(t('outline'), "admin/node/book/$book->nid")); + } + $headers = array(t('Book'), t('Operations')); + + return theme('table', $headers, $rows); +} + +/** + * Implementation of hook_help(). + */ +function book_help($section) { + switch ($section) { + case 'admin/help#book': + $output = '

              '. t('The book content type is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book, placing them into the existing document by adding them to a table of contents menu. ') .'

              '; + $output .= '

              '. t('Books have additional previous, up, and next navigation elements at the bottom of each page for moving through the text. Additional navigation may be provided by enabling the book navigation block on the block administration page.', array('%admin-block' => url('admin/block'))) .'

              '; + $output .= '

              '. t('Users can select the printer-friendly version link visible at the bottom of a book page to generate a printer-friendly display of the page and all of its subsections. ') .'

              '; + $output .= '

              '. t('Administrators can view a book outline, from which is it possible to change the titles of sections, and their weight (thus reordering sections). From this outline, it is also possible to edit and/or delete book pages. Many content types besides pages (for example, blog entries, stories, and polls) can be added to a collaborative book by choosing the outline tab when viewing the post.') .'

              '; + $output .= t('

              You can

              + +', array('%node-add-book' => url('node/add/book'), '%admin-node-book' => url('admin/node/book'), '%admin-settings-content-types-book-page' => url('admin/settings/content-types/book'), '%admin-block' => url('admin/block'), '%admin-access' => url('admin/access'))); + $output .= '

              '. t('For more information please read the configuration and customization handbook Book page.', array('%book' => 'http://drupal.org/handbook/modules/book/')) .'

              '; + return $output; + case 'admin/modules#description': + return t('Allows users to collaboratively author a book.'); + case 'admin/node/book': + return t('

              The book module offers a means to organize content, authored by many users, in an online manual, outline or FAQ.

              '); + case 'admin/node/book/orphan': + return t('

              Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are referred to as "orphan pages". On this page, administrators can review their books for orphans and reattach those pages as desired.

              '); + case 'node/add#book': + return t("A book is a collaborative writing effort: users can collaborate writing the pages of the book, positioning the pages in the right order, and reviewing or modifying pages previously written. So when you have some information to share or when you read a page of the book and you didn't like it, or if you think a certain page could have been written better, you can do something about it."); + } + + if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'outline') { + return t('The outline feature allows you to include posts in the book hierarchy.', array('%book' => url('book'))); + } +} + + diff --git a/modules/comment.module b/modules/comment.module new file mode 100644 index 0000000..d6df750 --- /dev/null +++ b/modules/comment.module @@ -0,0 +1,1787 @@ +'. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a community dialogue.') .'

              '; + $output .= '

              '. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since. Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Comments behave like other user submissions. Filters, smileys and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'

              '; + $output .= t('

              You can

              + +', array('%admin-access' => url('admin/access'), '%admin-comment-configure' => url('admin/comment/configure'))); + $output .= '

              '. t('For more information please read the configuration and customization handbook Comment page.', array('%comment' => 'http://drupal.org/handbook/modules/comment/')) .'

              '; + return $output; + case 'admin/modules#description': + return t('Allows users to comment on and discuss published content.'); + case 'admin/comment': + case 'admin/comment/new': + return t("

              Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information , \"edit\" to modify the text, and \"delete\" to remove their submission.

              "); + case 'admin/comment/approval': + return t("

              Below is a list of the comments posted to your site that need approval. To approve a comment, click on \"edit\" and then change its \"moderation status\" to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, \"edit\" to modify the text, and \"delete\" to remove their submission.

              "); + case 'admin/comment/configure': + case 'admin/comment/configure/settings': + return t("

              Comments can be attached to any node, and their settings are below. The display comes in two types: a \"flat list\" where everything is flush to the left side, and comments come in chronological order, and a \"threaded list\" where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: \"expanded\", where you see both the title and the contents, and \"collapsed\" where you only see the title. Preview comment forces a user to look at their comment by clicking on a \"Preview\" button before they can actually add the comment.

              "); + } +} + +/** + * Implementation of hook_menu(). + */ +function comment_menu($may_cache) { + $items = array(); + + if ($may_cache) { + $access = user_access('administer comments'); + $items[] = array('path' => 'admin/comment', 'title' => t('comments'), + 'callback' => 'comment_admin_overview', 'access' => $access); + + // Tabs: + $items[] = array('path' => 'admin/comment/list', 'title' => t('list'), + 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); + $items[] = array('path' => 'admin/comment/configure', 'title' => t('configure'), + 'callback' => 'comment_configure', 'access' => $access, 'type' => MENU_LOCAL_TASK); + + // Subtabs: + $items[] = array('path' => 'admin/comment/list/new', 'title' => t('published comments'), + 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); + $items[] = array('path' => 'admin/comment/list/approval', 'title' => t('approval queue'), + 'callback' => 'comment_admin_overview', 'access' => $access, + 'callback arguments' => array('approval'), + 'type' => MENU_LOCAL_TASK); + + $items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'), + 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); + + $items[] = array('path' => 'comment/delete', 'title' => t('delete comment'), + 'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK); + + $access = user_access('post comments'); + $items[] = array('path' => 'comment/edit', 'title' => t('edit comment'), + 'callback' => 'comment_edit', 'access' => $access, 'type' => MENU_CALLBACK); + } + else { + if (arg(0) == 'comment' && arg(1) == 'reply' && is_numeric(arg(2))) { + $node = node_load(arg(2)); + if ($node->nid) { + $items[] = array('path' => 'comment/reply', 'title' => t('reply to comment'), + 'callback' => 'comment_reply', 'access' => node_access('view', $node), 'type' => MENU_CALLBACK); + } + } + if ((arg(0) == 'node') && is_numeric(arg(1)) && is_numeric(arg(2))) { + $items[] = array('path' => ('node/'. arg(1) .'/'. arg(2)), 'title' => t('view'), + 'callback' => 'node_page', + 'type' => MENU_CALLBACK); + } + } + + return $items; +} + +/** + * Implementation of hook_perm(). + */ +function comment_perm() { + return array('access comments', 'post comments', 'administer comments', 'post comments without approval'); +} + +/** + * Implementation of hook_block(). + * + * Generates a block with the most recent comments. + */ +function comment_block($op = 'list', $delta = 0) { + if ($op == 'list') { + $blocks[0]['info'] = t('Recent comments'); + return $blocks; + } + else if ($op == 'view' && user_access('access comments')) { + $block['subject'] = t('Recent comments'); + $block['content'] = theme('comment_block'); + return $block; + } +} + +function theme_comment_block() { + $result = db_query_range(db_rewrite_sql('SELECT c.nid, c.subject, c.cid, c.timestamp FROM {comments} c INNER JOIN {node} n ON n.nid = c.nid WHERE n.status = 1 AND c.status = %d ORDER BY c.timestamp DESC', 'c'), COMMENT_PUBLISHED, 0, 10); + $items = array(); + while ($comment = db_fetch_object($result)) { + $items[] = l($comment->subject, 'node/'. $comment->nid, NULL, NULL, 'comment-'. $comment->cid) .'
              '. t('%time ago', array('%time' => format_interval(time() - $comment->timestamp))); + } + return theme('item_list', $items); +} + +/** + * Implementation of hook_link(). + */ +function comment_link($type, $node = 0, $main = 0) { + $links = array(); + + if ($type == 'node' && $node->comment) { + + if ($main) { + // Main page: display the number of comments that have been posted. + + if (user_access('access comments')) { + $all = comment_num_all($node->nid); + $new = comment_num_new($node->nid); + + if ($all) { + $links[] = l(format_plural($all, '1 comment', '%count comments'), "node/$node->nid", array('title' => t('Jump to the first comment of this posting.')), NULL, 'comment'); + + if ($new) { + $links[] = l(format_plural($new, '1 new comment', '%count new comments'), "node/$node->nid", array('title' => t('Jump to the first new comment of this posting.')), NULL, 'new'); + } + } + else { + if ($node->comment == COMMENT_NODE_READ_WRITE) { + if (user_access('post comments')) { + $links[] = l(t('add new comment'), "comment/reply/$node->nid", array('title' => t('Add a new comment to this page.')), NULL, 'comment_form'); + } + else { + $links[] = theme('comment_post_forbidden', $node->nid); + } + } + } + } + } + else { + // Node page: add a "post comment" link if the user is allowed to + // post comments, if this node is not read-only, and if the comment form isn't already shown + + if ($node->comment == COMMENT_NODE_READ_WRITE) { + if (user_access('post comments')) { + if (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) { + $links[] = l(t('add new comment'), "comment/reply/$node->nid", array('title' => t('Share your thoughts and opinions related to this posting.')), NULL, 'comment_form'); + } + } + else { + $links[] = theme('comment_post_forbidden', $node->nid); + } + } + } + } + + if ($type == 'comment') { + $links = comment_links($node, $main); + } + + return $links; +} + +function comment_form_alter($form_id, &$form) { + if (isset($form['type'])) { + if ($form['type']['#value'] .'_node_settings' == $form_id) { + $form['workflow']['comment_'. $form['type']['#value']] = array('#type' => 'radios', '#title' => t('Default comment setting'), '#default_value' => variable_get('comment_'. $form['type']['#value'], COMMENT_NODE_READ_WRITE), '#options' => array(t('Disabled'), t('Read only'), t('Read/Write')), '#description' => t('Users with the administer comments permission will be able to override this setting.')); + } + if ($form['type']['#value'] .'_node_form' == $form_id) { + $node = $form['#node']; + if (user_access('administer comments')) { + $form['comment_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Comment settings'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#weight' => 30, + ); + $form['comment_settings']['comment'] = array( + '#type' => 'radios', + '#parents' => array('comment'), + '#default_value' => $node->comment, + '#options' => array(t('Disabled'), t('Read only'), t('Read/Write')), + ); + } + else { + $form['comment_settings']['comment'] = array( + '#type' => 'value', + '#value' => $node->comment, + ); + } + } + } +} + +/** + * Implementation of hook_nodeapi(). + * + */ +function comment_nodeapi(&$node, $op, $arg = 0) { + switch ($op) { + case 'load': + return db_fetch_array(db_query("SELECT last_comment_timestamp, last_comment_name, comment_count FROM {node_comment_statistics} WHERE nid = %d", $node->nid)); + break; + + case 'prepare': + if (!isset($node->comment)) { + $node->comment = variable_get("comment_$node->type", COMMENT_NODE_READ_WRITE); + } + break; + + case 'insert': + db_query('INSERT INTO {node_comment_statistics} (nid, last_comment_timestamp, last_comment_name, last_comment_uid, comment_count) VALUES (%d, %d, NULL, %d, 0)', $node->nid, $node->created, $node->uid); + break; + + case 'delete': + db_query('DELETE FROM {comments} WHERE nid = %d', $node->nid); + db_query('DELETE FROM {node_comment_statistics} WHERE nid = %d', $node->nid); + break; + + case 'update index': + $text = ''; + $comments = db_query('SELECT subject, comment, format FROM {comments} WHERE nid = %d AND status = %d', $node->nid, COMMENT_PUBLISHED); + while ($comment = db_fetch_object($comments)) { + $text .= '

              '. check_plain($comment->subject) .'

              '. check_markup($comment->comment, $comment->format, FALSE); + } + return $text; + + case 'search result': + $comments = db_result(db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = %d', $node->nid)); + return format_plural($comments, '1 comment', '%count comments'); + + case 'rss item': + return array(array('key' => 'comments', 'value' => url('node/'. $node->nid, NULL, 'comment', TRUE))); + } +} + +/** + * Implementation of hook_user(). + * + * Provides signature customization for the user's comments. + */ +function comment_user($type, $edit, &$user, $category = NULL) { + if ($type == 'form' && $category == 'account') { + // when user tries to edit his own data + $form['comment_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Comment settings'), + '#collapsible' => TRUE, + '#weight' => 4); + $form['comment_settings']['signature'] = array( + '#type' => 'textarea', + '#title' => t('Signature'), + '#default_value' => $edit['signature'], + '#description' => t('Your signature will be publicly displayed at the end of your comments.')); + + return $form; + } + elseif ($type == 'delete') { + db_query('UPDATE {comments} SET uid = 0 WHERE uid = %d', $user->uid); + db_query('UPDATE {node_comment_statistics} SET last_comment_uid = 0 WHERE last_comment_uid = %d', $user->uid); + } +} + +/** + * Menu callback; presents the comment settings page. + */ +function comment_configure() { + $form['viewing_options'] = array( + '#type' => 'fieldset', + '#title' => t('Viewing options'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['viewing_options']['comment_default_mode'] = array( + '#type' => 'radios', + '#title' => t('Default display mode'), + '#default_value' => variable_get('comment_default_mode', COMMENT_MODE_THREADED_EXPANDED), + '#options' => _comment_get_modes(), + '#description' => t('The default view for comments. Expanded views display the body of the comment. Threaded views keep replies together.'), + ); + + $form['viewing_options']['comment_default_order'] = array( + '#type' => 'radios', + '#title' => t('Default display order'), + '#default_value' => variable_get('comment_default_order', COMMENT_ORDER_NEWEST_FIRST), + '#options' => _comment_get_orders(), + '#description' => t('The default sorting for new users and anonymous users while viewing comments. These users may change their view using the comment control panel. For registered users, this change is remembered as a persistent user preference.'), + ); + + $form['viewing_options']['comment_default_per_page'] = array( + '#type' => 'select', + '#title' => t('Default comments per page'), + '#default_value' => variable_get('comment_default_per_page', 50), + '#options' => _comment_per_page(), + '#description' => t('Default number of comments for each page: more comments are distributed in several pages.'), + ); + + $form['viewing_options']['comment_controls'] = array( + '#type' => 'radios', + '#title' => t('Comment controls'), + '#default_value' => variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN), + '#options' => array( + t('Display above the comments'), + t('Display below the comments'), + t('Display above and below the comments'), + t('Do not display')), + '#description' => t('Position of the comment controls box. The comment controls let the user change the default display mode and display order of comments.'), + ); + + $form['posting_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Posting settings'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['posting_settings']['comment_anonymous'] = array( + '#type' => 'radios', + '#title' => t('Anonymous commenting'), + '#default_value' => variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT), + '#options' => array( + COMMENT_ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'), + COMMENT_ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'), + COMMENT_ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information')), + '#description' => t('This option is enabled when anonymous users have permission to post comments on the permissions page.', array('%url' => url('admin/access'))), + ); + if (!user_access('post comments', user_load(array('uid' => 0)))) { + $form['posting_settings']['comment_anonymous']['#attributes'] = array('disabled' => 'disabled'); + } + + $form['posting_settings']['comment_subject_field'] = array( + '#type' => 'radios', + '#title' => t('Comment subject field'), + '#default_value' => variable_get('comment_subject_field', 1), + '#options' => array(t('Disabled'), t('Enabled')), + '#description' => t('Can users provide a unique subject for their comments?'), + ); + + $form['posting_settings']['comment_preview'] = array( + '#type' => 'radios', + '#title' => t('Preview comment'), + '#default_value' => variable_get('comment_preview', COMMENT_PREVIEW_REQUIRED), + '#options' => array(t('Optional'), t('Required')), + ); + + $form['posting_settings']['comment_form_location'] = array( + '#type' => 'radios', + '#title' => t('Location of comment submission form'), + '#default_value' => variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE), + '#options' => array(t('Display on separate page'), t('Display below post or comments')), + ); + + return system_settings_form('comment_settings_form', $form); +} + +/** + * This is *not* a hook_access() implementation. This function is called + * to determine whether the current user has access to a particular comment. + * + * Authenticated users can edit their comments as long they have not been + * replied to. This prevents people from changing or revising their + * statements based on the replies to their posts. + */ +function comment_access($op, $comment) { + global $user; + + if ($op == 'edit') { + return ($user->uid && $user->uid == $comment->uid && comment_num_replies($comment->cid) == 0) || user_access('administer comments'); + } +} + +function comment_node_url() { + return arg(0) .'/'. arg(1); +} + +function comment_edit($cid) { + global $user; + + $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d', $cid)); + $comment = drupal_unpack($comment); + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + if (comment_access('edit', $comment)) { + return comment_form((array)$comment); + } + else { + drupal_access_denied(); + } +} + +function comment_reply($nid, $pid = NULL) { + // set the breadcrumb trail + $node = node_load($nid); + menu_set_location(array(array('path' => "node/$nid", 'title' => $node->title), array('path' => "comment/reply/$nid"))); + + $op = isset($_POST['op']) ? $_POST['op'] : ''; + + $output = ''; + + // or are we merely showing the form? + if (user_access('access comments')) { + + if ($op == t('Preview comment')) { + if (user_access('post comments')) { + $output .= comment_form(array('pid' => $pid, 'nid' => $nid), NULL); + } + else { + drupal_set_message(t('You are not authorized to post comments.'), 'error'); + drupal_goto("node/$nid"); + } + } + else { + // if this is a reply to another comment, show that comment first + // else, we'll just show the user the node they're commenting on. + if ($pid) { + if ($comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d', $pid, COMMENT_PUBLISHED))) { + if ($comment->nid != $nid) { + // Attempting to reply to a comment not belonging to the current nid. + drupal_set_message(t('The comment you are replying to does not exist.'), 'error'); + drupal_goto("node/$nid"); + } + $comment = drupal_unpack($comment); + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + $output .= theme('comment_view', $comment); + } + else { + drupal_set_message(t('The comment you are replying to does not exist.'), 'error'); + drupal_goto("node/$nid"); + } + } + else if (user_access('access content')) { + $output .= node_view($node); + } + + // should we show the reply box? + if (node_comment_mode($nid) != COMMENT_NODE_READ_WRITE) { + drupal_set_message(t("This discussion is closed: you can't post new comments."), 'error'); + drupal_goto("node/$nid"); + } + else if (user_access('post comments')) { + $output .= comment_form(array('pid' => $pid, 'nid' => $nid), t('Reply')); + } + else { + drupal_set_message(t('You are not authorized to post comments.'), 'error'); + drupal_goto("node/$nid"); + } + } + } + else { + drupal_set_message(t('You are not authorized to view comments.'), 'error'); + drupal_goto("node/$nid"); + } + + return $output; +} + +/** + * Accepts a submission of new or changed comment content. + * + * @param $edit + * A comment array. + * + * @return + * If the comment is successfully saved the comment ID is returned. If the comment + * is not saved, FALSE is returned. + */ +function comment_save($edit) { + global $user; + if (user_access('post comments') && (user_access('administer comments') || node_comment_mode($edit['nid']) == COMMENT_NODE_READ_WRITE)) { + if (!form_get_errors()) { + // Check for duplicate comments. Note that we have to use the + // validated/filtered data to perform such check. + $duplicate = db_result(db_query("SELECT COUNT(cid) FROM {comments} WHERE pid = %d AND nid = %d AND subject = '%s' AND comment = '%s'", $edit['pid'], $edit['nid'], $edit['subject'], $edit['comment']), 0); + if ($duplicate != 0) { + watchdog('content', t('Comment: duplicate %subject.', array('%subject' => theme('placeholder', $edit['subject']))), WATCHDOG_WARNING); + } + + if ($edit['cid']) { + // Update the comment in the database. + db_query("UPDATE {comments} SET status = %d, timestamp = %d, subject = '%s', comment = '%s', format = %d, uid = %d, name = '%s', mail = '%s', homepage = '%s' WHERE cid = %d", $edit['status'], $edit['timestamp'], $edit['subject'], $edit['comment'], $edit['format'], $edit['uid'], $edit['name'], $edit['mail'], $edit['homepage'], $edit['cid']); + + _comment_update_node_statistics($edit['nid']); + + // Allow modules to respond to the updating of a comment. + comment_invoke_comment($edit, 'update'); + + + // Add an entry to the watchdog log. + watchdog('content', t('Comment: updated %subject.', array('%subject' => theme('placeholder', $edit['subject']))), WATCHDOG_NOTICE, l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); + } + else { + // Add the comment to database. + $status = user_access('post comments without approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED; + $roles = variable_get('comment_roles', array()); + $score = 0; + + foreach (array_intersect(array_keys($roles), array_keys($user->roles)) as $rid) { + $score = max($roles[$rid], $score); + } + + $users = serialize(array(0 => $score)); + + // Here we are building the thread field. See the comment + // in comment_render(). + if ($edit['pid'] == 0) { + // This is a comment with no parent comment (depth 0): we start + // by retrieving the maximum thread level. + $max = db_result(db_query('SELECT MAX(thread) FROM {comments} WHERE nid = %d', $edit['nid'])); + + // Strip the "/" from the end of the thread. + $max = rtrim($max, '/'); + + // Finally, build the thread field for this new comment. + $thread = int2vancode(vancode2int($max) + 1) .'/'; + } + else { + // This is comment with a parent comment: we increase + // the part of the thread value at the proper depth. + + // Get the parent comment: + $parent = _comment_load($edit['pid']); + + // Strip the "/" from the end of the parent thread. + $parent->thread = (string) rtrim((string) $parent->thread, '/'); + + // Get the max value in _this_ thread. + $max = db_result(db_query("SELECT MAX(thread) FROM {comments} WHERE thread LIKE '%s.%%' AND nid = %d", $parent->thread, $edit['nid'])); + + if ($max == '') { + // First child of this parent. + $thread = $parent->thread .'.'. int2vancode(0) .'/'; + } + else { + // Strip the "/" at the end of the thread. + $max = rtrim($max, '/'); + + // We need to get the value at the correct depth. + $parts = explode('.', $max); + $parent_depth = count(explode('.', $parent->thread)); + $last = $parts[$parent_depth]; + + // Finally, build the thread field for this new comment. + $thread = $parent->thread .'.'. int2vancode(vancode2int($last) + 1) .'/'; + } + } + + $edit['cid'] = db_next_id('{comments}_cid'); + $edit['timestamp'] = time(); + + if ($edit['uid'] == $user->uid) { + $edit['name'] = $user->name; + } + + db_query("INSERT INTO {comments} (cid, nid, pid, uid, subject, comment, format, hostname, timestamp, status, score, users, thread, name, mail, homepage) VALUES (%d, %d, %d, %d, '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s')", $edit['cid'], $edit['nid'], $edit['pid'], $edit['uid'], $edit['subject'], $edit['comment'], $edit['format'], $_SERVER['REMOTE_ADDR'], $edit['timestamp'], $status, $score, $users, $thread, $edit['name'], $edit['mail'], $edit['homepage']); + + _comment_update_node_statistics($edit['nid']); + + // Tell the other modules a new comment has been submitted. + comment_invoke_comment($edit, 'insert'); + + // Add an entry to the watchdog log. + watchdog('content', t('Comment: added %subject.', array('%subject' => theme('placeholder', $edit['subject']))), WATCHDOG_NOTICE, l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid'])); + } + + // Clear the cache so an anonymous user can see his comment being added. + cache_clear_all(); + + // Explain the approval queue if necessary, and then + // redirect the user to the node he's commenting on. + if ($status == COMMENT_NOT_PUBLISHED) { + drupal_set_message(t('Your comment has been queued for moderation by site administrators and will be published after approval.')); + } + return $edit['cid']; + } + else { + return FALSE; + } + } + else { + $txt = t('Comment: unauthorized comment submitted or comment submitted to a closed node %subject.', array('%subject' => theme('placeholder', $edit['subject']))); + watchdog('content', $txt, WATCHDOG_WARNING); + drupal_set_message($txt, 'error'); + return FALSE; + } +} + +function comment_links($comment, $return = 1) { + global $user; + + $links = array(); + + // If we are viewing just this comment, we link back to the node. + if ($return) { + $links[] = l(t('parent'), comment_node_url(), NULL, NULL, "comment-$comment->cid"); + } + + if (node_comment_mode($comment->nid) == COMMENT_NODE_READ_WRITE) { + if (user_access('administer comments') && user_access('post comments')) { + $links[] = l(t('delete'), "comment/delete/$comment->cid"); + $links[] = l(t('edit'), "comment/edit/$comment->cid"); + $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid"); + } + else if (user_access('post comments')) { + if (comment_access('edit', $comment)) { + $links[] = l(t('edit'), "comment/edit/$comment->cid"); + } + $links[] = l(t('reply'), "comment/reply/$comment->nid/$comment->cid"); + } + else { + $links[] = theme('comment_post_forbidden', $comment->nid); + } + } + + return $links; +} + +function comment_render($node, $cid = 0) { + global $user; + + $output = ''; + + if (user_access('access comments')) { + // Pre-process variables. + $nid = $node->nid; + if (empty($nid)) { + $nid = 0; + } + + $mode = _comment_get_display_setting('mode'); + $order = _comment_get_display_setting('sort'); + $comments_per_page = _comment_get_display_setting('comments_per_page'); + + $output .= "\n"; + + if ($cid) { + // Single comment view. + $query = 'SELECT c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.picture, u.data, c.score, c.users, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d'; + $query_args = array($cid); + if (!user_access('administer comments')) { + $query .= ' AND c.status = %d'; + $query_args[] = COMMENT_PUBLISHED; + } + $query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users, c.status'; + $result = db_query($query, $query_args); + + if ($comment = db_fetch_object($result)) { + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + $output .= theme('comment_view', $comment, module_invoke_all('link', 'comment', $comment, 1)); + } + } + else { + // Multiple comment view + $query_count = 'SELECT COUNT(*) FROM {comments} WHERE nid = %d'; + $query = 'SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.picture, u.data, c.score, c.users, c.thread, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d'; + + $query_args = array($nid); + if (!user_access('administer comments')) { + $query .= ' AND c.status = %d'; + $query_count .= ' AND status = %d'; + $query_args[] = COMMENT_PUBLISHED; + } + + $query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users, c.thread, c.status'; + + /* + ** We want to use the standard pager, but threads would need every + ** comment to build the thread structure, so we need to store some + ** extra info. + ** + ** We use a "thread" field to store this extra info. The basic idea + ** is to store a value and to order by that value. The "thread" field + ** keeps this data in a way which is easy to update and convenient + ** to use. + ** + ** A "thread" value starts at "1". If we add a child (A) to this + ** comment, we assign it a "thread" = "1.1". A child of (A) will have + ** "1.1.1". Next brother of (A) will get "1.2". Next brother of the + ** parent of (A) will get "2" and so on. + ** + ** First of all note that the thread field stores the depth of the + ** comment: depth 0 will be "X", depth 1 "X.X", depth 2 "X.X.X", etc. + ** + ** Now to get the ordering right, consider this example: + ** + ** 1 + ** 1.1 + ** 1.1.1 + ** 1.2 + ** 2 + ** + ** If we "ORDER BY thread ASC" we get the above result, and this is + ** the natural order sorted by time. However, if we "ORDER BY thread + ** DESC" we get: + ** + ** 2 + ** 1.2 + ** 1.1.1 + ** 1.1 + ** 1 + ** + ** Clearly, this is not a natural way to see a thread, and users + ** will get confused. The natural order to show a thread by time + ** desc would be: + ** + ** 2 + ** 1 + ** 1.2 + ** 1.1 + ** 1.1.1 + ** + ** which is what we already did before the standard pager patch. To + ** achieve this we simply add a "/" at the end of each "thread" value. + ** This way out thread fields will look like depicted below: + ** + ** 1/ + ** 1.1/ + ** 1.1.1/ + ** 1.2/ + ** 2/ + ** + ** we add "/" since this char is, in ASCII, higher than every number, + ** so if now we "ORDER BY thread DESC" we get the correct order. Try + ** it, it works ;). However this would spoil the "ORDER BY thread ASC" + ** Here, we do not need to consider the trailing "/" so we use a + ** substring only. + */ + + if ($order == COMMENT_ORDER_NEWEST_FIRST) { + if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) { + $query .= ' ORDER BY c.timestamp DESC'; + } + else { + $query .= ' ORDER BY c.thread DESC'; + } + } + else if ($order == COMMENT_ORDER_OLDEST_FIRST) { + if ($mode == COMMENT_MODE_FLAT_COLLAPSED || $mode == COMMENT_MODE_FLAT_EXPANDED) { + $query .= ' ORDER BY c.timestamp'; + } + else { + + /* + ** See comment above. Analysis learns that this doesn't cost + ** too much. It scales much much better than having the whole + ** comment structure. + */ + + $query .= ' ORDER BY SUBSTRING(c.thread, 1, (LENGTH(c.thread) - 1))'; + } + } + + // Start a form, for use with comment control. + $result = pager_query($query, $comments_per_page, 0, $query_count, $query_args); + if (db_num_rows($result) && (variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_ABOVE || variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_ABOVE_BELOW)) { + $output .= comment_controls($mode, $order, $comments_per_page); + } + + while ($comment = db_fetch_object($result)) { + $comment = drupal_unpack($comment); + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + $comment->depth = count(explode('.', $comment->thread)) - 1; + + if ($mode == COMMENT_MODE_FLAT_COLLAPSED) { + $output .= theme('comment_flat_collapsed', $comment); + } + else if ($mode == COMMENT_MODE_FLAT_EXPANDED) { + $output .= theme('comment_flat_expanded', $comment); + } + else if ($mode == COMMENT_MODE_THREADED_COLLAPSED) { + $output .= theme('comment_thread_collapsed', $comment); + } + else if ($mode == COMMENT_MODE_THREADED_EXPANDED) { + $output .= theme('comment_thread_expanded', $comment); + } + } + + $output .= theme('pager', NULL, $comments_per_page, 0); + + if (db_num_rows($result) && (variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_BELOW || variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_ABOVE_BELOW)) { + $output .= comment_controls($mode, $order, $comments_per_page); + } + } + + // If enabled, show new comment form. + if (user_access('post comments') && node_comment_mode($nid) == COMMENT_NODE_READ_WRITE && (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_BELOW)) { + $output .= comment_form(array('nid' => $nid), t('Post new comment')); + } + } + return $output; +} + + +/** + * Menu callback; delete a comment. + */ +function comment_delete($cid) { + $comment = db_fetch_object(db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = %d', $cid)); + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + + $output = ''; + + // We'll only delete if the user has confirmed the + // deletion using the form in our else clause below. + if (is_object($comment) && is_numeric($comment->cid) && $_POST['edit']['confirm']) { + drupal_set_message(t('The comment and all its replies have been deleted.')); + + // Delete comment and its replies. + _comment_delete_thread($comment); + + _comment_update_node_statistics($comment->nid); + + // Clear the cache so an anonymous user sees that his comment was deleted. + cache_clear_all(); + + drupal_goto("node/$comment->nid"); + } + else if (is_object($comment) && is_numeric($comment->cid)) { + $output = confirm_form('comment_confirm_delete', + array(), + t('Are you sure you want to delete the comment %title?', array('%title' => theme('placeholder', $comment->subject))), + 'node/'. $comment->nid, + t('Any replies to this comment will be lost. This action cannot be undone.'), + t('Delete'), + t('Cancel')); + } + else { + drupal_set_message(t('The comment no longer exists.')); + } + + return $output; +} + +/** + * Comment operations. We offer different update operations depending on + * which comment administration page we're on. + */ +function comment_operations($action = NULL) { + if ($action == 'publish') { + $operations = array( + 'publish' => array(t('Publish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_PUBLISHED .' WHERE cid = %d'), + 'delete' => array(t('Delete the selected comments'), '') + ); + } + else if ($action == 'unpublish') { + $operations = array( + 'unpublish' => array(t('Unpublish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_NOT_PUBLISHED .' WHERE cid = %d'), + 'delete' => array(t('Delete the selected comments'), '') + ); + } + else { + $operations = array( + 'publish' => array(t('Publish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_PUBLISHED .' WHERE cid = %d'), + 'unpublish' => array(t('Unpublish the selected comments'), 'UPDATE {comments} SET status = '. COMMENT_NOT_PUBLISHED .' WHERE cid = %d'), + 'delete' => array(t('Delete the selected comments'), '') + ); + } + return $operations; +} + +/** + * Menu callback; present an administrative comment listing. + */ +function comment_admin_overview($type = 'new') { + $edit = $_POST['edit']; + + if ($edit['operation'] == 'delete') { + return comment_multiple_delete_confirm(); + } + + // build an 'Update options' form + $form['options'] = array( + '#type' => 'fieldset', '#title' => t('Update options'), + '#prefix' => '
              ', '#suffix' => '
              ' + ); + $options = array(); + foreach (comment_operations(arg(3) == 'approval' ? 'publish' : 'unpublish') as $key => $value) { + $options[$key] = $value[0]; + } + $form['options']['operation'] = array('#type' => 'select', '#options' => $options, '#default_value' => 'publish'); + $form['options']['submit'] = array('#type' => 'submit', '#value' => t('Update')); + + // load the comments that we want to display + $status = ($type == 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED; + $form['header'] = array('#type' => 'value', '#value' => array( + NULL, + array('data' => t('Subject'), 'field' => 'subject'), + array('data' => t('Author'), 'field' => 'name'), + array('data' => t('Time'), 'field' => 'timestamp', 'sort' => 'desc'), + array('data' => t('Operations')) + )); + $result = pager_query('SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, c.homepage, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = %d'. tablesort_sql($form['header']['#value']), 50, 0, NULL, $status); + + // build a table listing the appropriate comments + $destination = drupal_get_destination(); + while ($comment = db_fetch_object($result)) { + $comments[$comment->cid] = ''; + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + $form['subject'][$comment->cid] = array('#value' => l($comment->subject, 'node/'. $comment->nid, array('title' => truncate_utf8($comment->comment, 128)), NULL, 'comment-'. $comment->cid)); + $form['username'][$comment->cid] = array('#value' => theme('username', $comment)); + $form['timestamp'][$comment->cid] = array('#value' => format_date($comment->timestamp, 'small')); + $form['operations'][$comment->cid] = array('#value' => l(t('edit'), 'comment/edit/'. $comment->cid, array(), $destination)); + } + $form['comments'] = array('#type' => 'checkboxes', '#options' => $comments); + $form['pager'] = array('#value' => theme('pager', NULL, 50, 0)); + return drupal_get_form('comment_admin_overview', $form); +} + +/** + * We can't execute any 'Update options' if no comments were selected. + */ +function comment_admin_overview_validate($form_id, $edit) { + $edit['comments'] = array_diff($edit['comments'], array(0)); + if (count($edit['comments']) == 0) { + form_set_error('', t('Please select one or more comments to perform the update on.')); + drupal_goto('admin/comment'); + } +} + +/** + * Execute the chosen 'Update option' on the selected comments, such as + * publishing, unpublishing or deleting. + */ +function comment_admin_overview_submit($form_id, $edit) { + $operations = comment_operations(); + if ($operations[$edit['operation']][1]) { + // extract the appropriate database query operation + $query = $operations[$edit['operation']][1]; + foreach ($edit['comments'] as $cid => $value) { + if ($value) { + // perform the update action, then refresh node statistics + db_query($query, $cid); + $comment = _comment_load($cid); + _comment_update_node_statistics($comment->nid); + // Allow modules to respond to the updating of a comment. + comment_invoke_comment($comment, $edit['operation']); + // Add an entry to the watchdog log. + watchdog('content', t('Comment: updated %subject.', array('%subject' => theme('placeholder', $comment->subject))), WATCHDOG_NOTICE, l(t('view'), 'node/'. $comment->nid, NULL, NULL, 'comment-'. $comment->cid)); + } + } + cache_clear_all(); + drupal_set_message(t('The update has been performed.')); + drupal_goto('admin/comment'); + } +} + +function theme_comment_admin_overview($form) { + $output = form_render($form['options']); + if (isset($form['subject']) && is_array($form['subject'])) { + foreach (element_children($form['subject']) as $key) { + $row = array(); + $row[] = form_render($form['comments'][$key]); + $row[] = form_render($form['subject'][$key]); + $row[] = form_render($form['username'][$key]); + $row[] = form_render($form['timestamp'][$key]); + $row[] = form_render($form['operations'][$key]); + $rows[] = $row; + } + } + else { + $rows[] = array(array('data' => t('No comments available.'), 'colspan' => '6')); + } + + $output .= theme('table', $form['header']['#value'], $rows); + if ($form['pager']['#value']) { + $output .= form_render($form['pager']); + } + + $output .= form_render($form); + + return $output; +} + +/** + * List the selected comments and verify that the admin really wants to delete + * them. + */ +function comment_multiple_delete_confirm() { + $edit = $_POST['edit']; + + $form['comments'] = array('#prefix' => '
                ', '#suffix' => '
              ', '#tree' => TRUE); + // array_filter() returns only elements with actual values + $comment_counter = 0; + foreach (array_filter($edit['comments']) as $cid => $value) { + $comment = _comment_load($cid); + if (is_object($comment) && is_numeric($comment->cid)) { + $subject = db_result(db_query('SELECT subject FROM {comments} WHERE cid = %d', $cid)); + $form['comments'][$cid] = array('#type' => 'hidden', '#value' => $cid, '#prefix' => '
            • ', '#suffix' => check_plain($subject) .'
              • '); + $comment_counter++; + } + } + $form['operation'] = array('#type' => 'hidden', '#value' => 'delete'); + + if (!$comment_counter) { + drupal_set_message(t('There do not appear to be any comments to delete or your selected comment was deleted by another administrator.')); + drupal_goto('admin/comment'); + } + else { + return confirm_form('comment_multiple_delete_confirm', $form, + t('Are you sure you want to delete these comments and all their children?'), + 'admin/comment', t('This action cannot be undone.'), + t('Delete comments'), t('Cancel')); + } +} + +/** + * Perform the actual comment deletion. + */ +function comment_multiple_delete_confirm_submit($form_id, $edit) { + if ($edit['confirm']) { + foreach ($edit['comments'] as $cid => $value) { + $comment = _comment_load($cid); + _comment_delete_thread($comment); + _comment_update_node_statistics($comment->nid); + cache_clear_all(); + } + drupal_set_message(t('The comments have been deleted.')); + } + drupal_goto('admin/comment'); +} + +/** +*** misc functions: helpers, privates, history +**/ + +/** + * Load the entire comment by cid. + */ +function _comment_load($cid) { + return db_fetch_object(db_query('SELECT * FROM {comments} WHERE cid = %d', $cid)); +} + +function comment_num_all($nid) { + static $cache; + + if (!isset($cache[$nid])) { + $cache[$nid] = db_result(db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = %d', $nid)); + } + return $cache[$nid]; +} + +function comment_num_replies($pid) { + static $cache; + + if (!isset($cache[$pid])) { + $cache[$pid] = db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE pid = %d AND status = %d', $pid, COMMENT_PUBLISHED)); + } + + return $cache[$pid]; +} + +/** + * get number of new comments for current user and specified node + * + * @param $nid node-id to count comments for + * @param $timestamp time to count from (defaults to time of last user access + * to node) + */ +function comment_num_new($nid, $timestamp = 0) { + global $user; + + if ($user->uid) { + // Retrieve the timestamp at which the current user last viewed the + // specified node. + if (!$timestamp) { + $timestamp = node_last_viewed($nid); + } + $timestamp = ($timestamp > NODE_NEW_LIMIT ? $timestamp : NODE_NEW_LIMIT); + + // Use the timestamp to retrieve the number of new comments. + $result = db_result(db_query('SELECT COUNT(c.cid) FROM {node} n INNER JOIN {comments} c ON n.nid = c.nid WHERE n.nid = %d AND timestamp > %d AND c.status = %d', $nid, $timestamp, COMMENT_PUBLISHED)); + + return $result; + } + else { + return 0; + } + +} + +function comment_validate($edit) { + global $user; + + // Invoke other validation handlers + comment_invoke_comment($edit, 'validate'); + + if (isset($edit['date'])) { + // As of PHP 5.1.0, strtotime returns FALSE upon failure instead of -1. + if (strtotime($edit['date']) <= 0) { + form_set_error('date', t('You have to specify a valid date.')); + } + } + if (isset($edit['author']) && !$account = user_load(array('name' => $edit['author']))) { + form_set_error('author', t('You have to specify a valid author.')); + } + + // Check validity of name, mail and homepage (if given) + if (!$user->uid || isset($edit['is_anonymous'])) { + if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) > COMMENT_ANONYMOUS_MAYNOT_CONTACT) { + if ($edit['name']) { + $taken = db_result(db_query("SELECT COUNT(uid) FROM {users} WHERE LOWER(name) = '%s'", $edit['name']), 0); + + if ($taken != 0) { + form_set_error('name', t('The name you used belongs to a registered user.')); + } + + } + else if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { + form_set_error('name', t('You have to leave your name.')); + } + + if ($edit['mail']) { + if (!valid_email_address($edit['mail'])) { + form_set_error('mail', t('The e-mail address you specified is not valid.')); + } + } + else if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { + form_set_error('mail', t('You have to leave an e-mail address.')); + } + + if ($edit['homepage']) { + if (!valid_url($edit['homepage'], TRUE)) { + form_set_error('homepage', t('The URL of your homepage is not valid. Remember that it must be fully qualified, i.e. of the form http://example.com/directory.')); + } + } + } + } + + return $edit; +} + +/* +** Generate the basic commenting form, for appending to a node or display on a separate page. +** This is rendered by theme_comment_form. +*/ + +function comment_form($edit, $title = NULL) { + global $user; + + $op = isset($_POST['op']) ? $_POST['op'] : ''; + + if ($user->uid) { + if ($edit['cid'] && user_access('administer comments')) { + if ($edit['author']) { + $author = $edit['author']; + } + elseif ($edit['name']) { + $author = $edit['name']; + } + else { + $author = $edit['registered_name']; + } + + if ($edit['status']) { + $status = $edit['status']; + } + else { + $status = 0; + } + + if ($edit['date']) { + $date = $edit['date']; + } + else { + $date = format_date($edit['timestamp'], 'custom', 'Y-m-d H:i O'); + } + + $form['admin'] = array( + '#type' => 'fieldset', + '#title' => t('Administration'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#weight' => -2, + ); + + if ($edit['registered_name'] != '') { + // The comment is by a registered user + $form['admin']['author'] = array( + '#type' => 'textfield', + '#title' => t('Authored by'), + '#size' => 30, + '#maxlength' => 60, + '#autocomplete_path' => 'user/autocomplete', + '#default_value' => $author, + '#weight' => -1, + ); + } + else { + // The comment is by an anonymous user + $form['is_anonymous'] = array( + '#type' => 'value', + '#value' => TRUE, + ); + $form['admin']['name'] = array( + '#type' => 'textfield', + '#title' => t('Authored by'), + '#size' => 30, + '#maxlength' => 60, + '#default_value' => $author, + '#weight' => -1, + ); + $form['admin']['mail'] = array( + '#type' => 'textfield', + '#title' => t('E-mail'), + '#maxlength' => 64, + '#size' => 30, + '#default_value' => $edit['mail'], + '#description' => t('The content of this field is kept private and will not be shown publicly.'), + ); + + $form['admin']['homepage'] = array( + '#type' => 'textfield', + '#title' => t('Homepage'), + '#maxlength' => 255, + '#size' => 30, + '#default_value' => $edit['homepage'], + ); + } + + $form['admin']['date'] = array('#type' => 'textfield', '#parents' => array('date'), '#title' => t('Authored on'), '#size' => 20, '#maxlength' => 25, '#default_value' => $date, '#weight' => -1); + + $form['admin']['status'] = array('#type' => 'radios', '#parents' => array('status'), '#title' => t('Status'), '#default_value' => $status, '#options' => array(t('Published'), t('Not published')), '#weight' => -1); + + } + else { + $form['_author'] = array('#type' => 'item', '#title' => t('Your name'), '#value' => theme('username', $user) + ); + $form['author'] = array('#type' => 'value', '#value' => $user->name); + } + } + else if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MAY_CONTACT) { + $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', 'Anonymous') + ); + + $form['mail'] = array('#type' => 'textfield', '#title' => t('E-mail'), '#maxlength' => 64, '#size' => 30, '#default_value' => $edit['mail'], '#description' => t('The content of this field is kept private and will not be shown publicly.') + ); + + $form['homepage'] = array('#type' => 'textfield', '#title' => t('Homepage'), '#maxlength' => 255, '#size' => 30, '#default_value' => $edit['homepage']); + } + else if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { + $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', 'Anonymous'), '#required' => TRUE); + + $form['mail'] = array('#type' => 'textfield', '#title' => t('E-mail'), '#maxlength' => 64, '#size' => 30, '#default_value' => $edit['mail'],'#description' => t('The content of this field is kept private and will not be shown publicly.'), '#required' => TRUE); + + $form['homepage'] = array('#type' => 'textfield', '#title' => t('Homepage'), '#maxlength' => 255, '#size' => 30, '#default_value' => $edit['homepage']); + } + + if (variable_get('comment_subject_field', 1) == 1) { + $form['subject'] = array('#type' => 'textfield', '#title' => t('Subject'), '#maxlength' => 64, '#default_value' => $edit['subject']); + } + + $form['comment_filter']['comment'] = array('#type' => 'textarea', '#title' => t('Comment'), '#rows' => 15, '#default_value' => $edit['comment'] ? $edit['comment'] : $user->signature, '#required' => TRUE); + $form['comment_filter']['format'] = filter_form($edit['format']); + + $form['cid'] = array('#type' => 'value', '#value' => $edit['cid']); + $form['pid'] = array('#type' => 'value', '#value' => $edit['pid']); + $form['nid'] = array('#type' => 'value', '#value' => $edit['nid']); + $form['uid'] = array('#type' => 'value', '#value' => $edit['uid']); + + $form['preview'] = array('#type' => 'button', '#value' => t('Preview comment'), '#weight' => 19); + $form['#token'] = 'comment' . $edit['nid'] . $edit['pid']; + + // Only show post button if preview is optional or if we are in preview mode. + // We show the post button in preview mode even if there are form errors so that + // optional form elements (e.g., captcha) can be updated in preview mode. + if (!form_get_errors() && ((variable_get('comment_preview', COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview comment')) || ($op == t('Post comment')))) { + $form['submit'] = array('#type' => 'submit', '#value' => t('Post comment'), '#weight' => 20); + } + + if ($op == t('Preview comment')) { + $form['#after_build'] = array('comment_form_add_preview'); + } + + if ($_REQUEST['destination']) { + $form['#attributes']['destination'] = $_REQUEST['destination']; + } + + if (empty($edit['cid']) && empty($edit['pid'])) { + $form['#action'] = url('comment/reply/'. $edit['nid']); + } + + // Graft in extra form additions + $form = array_merge($form, comment_invoke_comment($form, 'form')); + + return theme('box', $title, drupal_get_form('comment_form', $form)); +} + +function comment_form_add_preview($form, $edit) { + global $user; + + drupal_set_title(t('Preview comment')); + + $output = ''; + + comment_validate($edit); + $comment = (object)_comment_form_submit($edit); + + // Attach the user and time information. + if ($edit['author']) { + $account = user_load(array('name' => $edit['author'])); + } + elseif ($user->uid && !isset($edit['is_anonymous'])) { + $account = $user; + } + if ($account) { + $comment->uid = $account->uid; + $comment->name = check_plain($account->name); + } + $comment->timestamp = $edit['timestamp'] ? $edit['timestamp'] : time(); + + // Preview the comment with security check. + if (!form_get_errors()) { + $output .= theme('comment_view', $comment); + } + $form['comment_preview'] = array( + '#value' => $output, + '#weight' => -100, + '#prefix' => '
              ', + '#suffix' => '
              ', + ); + + $output = ''; + + if ($edit['pid']) { + $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.picture, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = %d', $edit['pid'], COMMENT_PUBLISHED)); + $comment = drupal_unpack($comment); + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + $output .= theme('comment_view', $comment); + } + else { + $form['#suffix'] = node_view(node_load($edit['nid'])); + $edit['pid'] = 0; + } + + $form['comment_preview_below'] = array('#value' => $output, '#weight' => 100); + + return $form; +} + +function comment_form_validate($form_id, $form_values) { + comment_validate($form_values); +} + +function _comment_form_submit($form_values) { + if (!isset($form_values['date'])) { + $form_values['date'] = 'now'; + } + $form_values['timestamp'] = strtotime($form_values['date']); + if (isset($form_values['author'])) { + $account = user_load(array('name' => $form_values['author'])); + $form_values['uid'] = $account->uid; + $form_values['name'] = $form_values['author']; + } + // Validate the comment's subject. If not specified, extract + // one from the comment's body. + if (trim($form_values['subject']) == '') { + // The body may be in any format, so we: + // 1) Filter it into HTML + // 2) Strip out all HTML tags + // 3) Convert entities back to plain-text. + // Note: format is checked by check_markup(). + $form_values['subject'] = truncate_utf8(decode_entities(strip_tags(check_markup($form_values['comment'], $form_values['format']))), 29, TRUE); + } + return $form_values; +} + +function comment_form_submit($form_id, $form_values) { + $form_values = _comment_form_submit($form_values); + if ($cid = comment_save($form_values)) { + return array('node/'. $form_values['nid'], NULL, "comment-$cid"); + } +} + +/* +** Renderer or visualization functions this can be optionally +** overridden by themes. +*/ + +function theme_comment_preview($comment, $links = array(), $visible = 1) { + $output = '
              '; + $output .= theme('comment_view', $comment, $links, $visible); + $output .= '
              '; + return $output; +}; + +function theme_comment_view($comment, $links = array(), $visible = 1) { + + // Emit selectors: + $output = ''; + if (($comment->new = node_mark($comment->nid, $comment->timestamp)) != MARK_READ) { + $output .= "\n"; + } + + $output .= "cid\">\n"; + + // Switch to folded/unfolded view of the comment + if ($visible) { + $comment->comment = check_markup($comment->comment, $comment->format, FALSE); + + // Comment API hook + comment_invoke_comment($comment, 'view'); + + $output .= theme('comment', $comment, $links); + } + else { + $output .= theme('comment_folded', $comment); + } + + return $output; +} + +function comment_controls($mode = COMMENT_MODE_THREADED_EXPANDED, $order = COMMENT_ORDER_NEWEST_FIRST, $comments_per_page = 50) { + $form['mode'] = array('#type' => 'select', + '#default_value' => $mode, + '#options' => _comment_get_modes(), + '#weight' => 1, + ); + $form['order'] = array( + '#type' => 'select', + '#default_value' => $order, + '#options' => _comment_get_orders(), + '#weight' => 2, + ); + foreach (_comment_per_page() as $i) { + $options[$i] = t('%a comments per page', array('%a' => $i)); + } + $form['comments_per_page'] = array('#type' => 'select', + '#default_value' => $comments_per_page, + '#options' => $options, + '#weight' => 3, + ); + + $form['submit'] = array('#type' => 'submit', + '#value' => t('Save settings'), + '#weight' => 20, + ); + + return drupal_get_form('comment_controls', $form); +} + +function theme_comment_controls($form) { + $output .= '
              '; + $output .= form_render($form); + $output .= '
              '; + $output .= '
              '. t('Select your preferred way to display the comments and click "Save settings" to activate your changes.') .'
              '; + return theme('box', t('Comment viewing options'), $output); +} + +function comment_controls_submit($form_id, $form_values) { + global $user; + + $mode = $form_values['mode']; + $order = $form_values['order']; + $comments_per_page = $form_values['comments_per_page']; + + if ($user->uid) { + $user = user_save($user, array('mode' => $mode, 'sort' => $order, 'comments_per_page' => $comments_per_page)); + } + else { + $_SESSION['comment_mode'] = $mode; + $_SESSION['comment_sort'] = $order; + $_SESSION['comment_comments_per_page'] = $comments_per_page; + } +} + +function theme_comment($comment, $links = array()) { + $output = '
              '; + $output .= '
              '. l($comment->subject, $_GET['q'], NULL, NULL, "comment-$comment->cid") . ' ' . theme('mark', $comment->new) ."
              \n"; + $output .= '
              '. t('by %a on %b', array('%a' => theme('username', $comment), '%b' => format_date($comment->timestamp))) ."
              \n"; + $output .= '
              '. $comment->comment .'
              '; + $output .= '
              '. theme('links', $links) .'
              '; + $output .= '
              '; + return $output; +} + +function theme_comment_folded($comment) { + $output = "
              \n"; + $output .= ' '. l($comment->subject, comment_node_url() .'/'. $comment->cid, NULL, NULL, "comment-$comment->cid") . ' '. theme('mark', $comment->new) .' '; + $output .= ''. t('by') .' '. theme('username', $comment) ."\n"; + $output .= "
              \n"; + return $output; +} + +function theme_comment_flat_collapsed($comment) { + return theme('comment_view', $comment, '', 0); + return ''; +} + +function theme_comment_flat_expanded($comment) { + return theme('comment_view', $comment, module_invoke_all('link', 'comment', $comment, 0)); +} + +function theme_comment_thread_collapsed($comment) { + $output = '
              \n"; + $output .= theme('comment_view', $comment, '', 0); + $output .= "
              \n"; + return $output; +} + +function theme_comment_thread_expanded($comment) { + $output = ''; + if ($comment->depth) { + $output .= '
              \n"; + } + + $output .= theme('comment_view', $comment, module_invoke_all('link', 'comment', $comment, 0)); + + if ($comment->depth) { + $output .= "
              \n"; + } + return $output; +} + +function theme_comment_post_forbidden($nid) { + global $user; + if ($user->uid) { + return t("you can't post comments"); + } + else { + // we cannot use drupal_get_destination() because these links sometimes appear on /node and taxo listing pages + if (variable_get('comment_form_location', COMMENT_FORM_SEPARATE_PAGE) == COMMENT_FORM_SEPARATE_PAGE) { + $destination = "destination=". drupal_urlencode("comment/reply/$nid#comment_form"); + } + else { + $destination = "destination=". drupal_urlencode("node/$nid#comment_form"); + } + + if (variable_get('user_register', 1)) { + return t('login or register to post comments', array('%login' => url('user/login', $destination), '%register' => check_url(url('user/register', $destination)))); + } + else { + return t('login to post comments', array('%login' => check_url(url('user/login', $destination)))); + } + } +} + +function _comment_delete_thread($comment) { + if (!is_object($comment) || !is_numeric($comment->cid)) { + watchdog('content', t('Can not delete non-existent comment.'), WATCHDOG_WARNING); + return; + } + + // Delete the comment: + db_query('DELETE FROM {comments} WHERE cid = %d', $comment->cid); + watchdog('content', t('Comment: deleted %subject.', array('%subject' => theme('placeholder', $comment->subject)))); + + comment_invoke_comment($comment, 'delete'); + + // Delete the comment's replies + $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE pid = %d', $comment->cid); + while ($comment = db_fetch_object($result)) { + $comment->name = $comment->uid ? $comment->registered_name : $comment->name; + _comment_delete_thread($comment); + } +} + +/** + * Return an array of viewing modes for comment listings. + * + * We can't use a global variable array because the locale system + * is not initialized yet when the comment module is loaded. + */ +function _comment_get_modes() { + return array( + COMMENT_MODE_FLAT_COLLAPSED => t('Flat list - collapsed'), + COMMENT_MODE_FLAT_EXPANDED => t('Flat list - expanded'), + COMMENT_MODE_THREADED_COLLAPSED => t('Threaded list - collapsed'), + COMMENT_MODE_THREADED_EXPANDED => t('Threaded list - expanded') + ); +} + +/** + * Return an array of viewing orders for comment listings. + * + * We can't use a global variable array because the locale system + * is not initialized yet when the comment module is loaded. + */ +function _comment_get_orders() { + return array( + COMMENT_ORDER_NEWEST_FIRST => t('Date - newest first'), + COMMENT_ORDER_OLDEST_FIRST => t('Date - oldest first') + ); +} + +/** + * Return an array of "comments per page" settings from which the user + * can choose. + */ +function _comment_per_page() { + return drupal_map_assoc(array(10, 30, 50, 70, 90, 150, 200, 250, 300)); +} + +/** + * Return a current comment display setting + * + * $setting can be one of these: 'mode', 'sort', 'comments_per_page' + */ +function _comment_get_display_setting($setting) { + global $user; + + if ($_GET[$setting]) { + $value = $_GET[$setting]; + } + else { + // get the setting's site default + switch ($setting) { + case 'mode': + $default = variable_get('comment_default_mode', COMMENT_MODE_THREADED_EXPANDED); + break; + case 'sort': + $default = variable_get('comment_default_order', COMMENT_ORDER_NEWEST_FIRST); + break; + case 'comments_per_page': + $default = variable_get('comment_default_per_page', '50'); + } + if (variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_HIDDEN) { + // if comment controls are disabled use site default + $value = $default; + } + else { + // otherwise use the user's setting if set + if ($user->$setting) { + $value = $user->$setting; + } + else if ($_SESSION['comment_'. $setting]) { + $value = $_SESSION['comment_'. $setting]; + } + else { + $value = $default; + } + } + } + return $value; +} + +/** + * Updates the comment statistics for a given node. This should be called any + * time a comment is added, deleted, or updated. + * + * The following fields are contained in the node_comment_statistics table. + * - last_comment_timestamp: the timestamp of the last comment for this node or the node create stamp if no comments exist for the node. + * - last_comment_name: the name of the anonymous poster for the last comment + * - last_comment_uid: the uid of the poster for the last comment for this node or the node authors uid if no comments exists for the node. + * - comment_count: the total number of approved/published comments on this node. + */ +function _comment_update_node_statistics($nid) { + $count = db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE nid = %d AND status = %d', $nid, COMMENT_PUBLISHED)); + + // comments exist + if ($count > 0) { + $last_reply = db_fetch_object(db_query_range('SELECT cid, name, timestamp, uid FROM {comments} WHERE nid = %d AND status = %d ORDER BY cid DESC', $nid, COMMENT_PUBLISHED, 0, 1)); + db_query("UPDATE {node_comment_statistics} SET comment_count = %d, last_comment_timestamp = %d, last_comment_name = '%s', last_comment_uid = %d WHERE nid = %d", $count, $last_reply->timestamp, $last_reply->uid ? '' : $last_reply->name, $last_reply->uid, $nid); + } + + // no comments + else { + $node = db_fetch_object(db_query("SELECT uid, created FROM {node} WHERE nid = %d", $nid)); + db_query("UPDATE {node_comment_statistics} SET comment_count = 0, last_comment_timestamp = %d, last_comment_name = '', last_comment_uid = %d WHERE nid = %d", $node->created, $node->uid, $nid); + } +} + +/** + * Invoke a hook_comment() operation in all modules. + * + * @param &$comment + * A comment object. + * @param $op + * A string containing the name of the comment operation. + * @return + * The returned value of the invoked hooks. + */ +function comment_invoke_comment(&$comment, $op) { + $return = array(); + foreach (module_implements('comment') as $name) { + $function = $name .'_comment'; + $result = $function($comment, $op); + if (isset($result) && is_array($result)) { + $return = array_merge($return, $result); + } + else if (isset($result)) { + $return[] = $result; + } + } + return $return; +} + +/** + * Generate vancode. + * + * Consists of a leading character indicating length, followed by N digits + * with a numerical value in base 36. Vancodes can be sorted as strings + * without messing up numerical order. + * + * It goes: + * 00, 01, 02, ..., 0y, 0z, + * 110, 111, ... , 1zy, 1zz, + * 2100, 2101, ..., 2zzy, 2zzz, + * 31000, 31001, ... + */ +function int2vancode($i = 0) { + $num = base_convert((int)$i, 10, 36); + $length = strlen($num); + return chr($length + ord('0') - 1) . $num; +} + +/** + * Decode vancode back to an integer. + */ +function vancode2int($c = '00') { + return base_convert(substr($c, 1), 36, 10); +} diff --git a/modules/contact.module b/modules/contact.module new file mode 100644 index 0000000..82114bf --- /dev/null +++ b/modules/contact.module @@ -0,0 +1,549 @@ +'. t('The contact module enables the use of both personal and site-wide contact forms, thereby facilitating easy communication within the community. While personal contact forms allow users to contact each other by e-mail, site-wide forms allow community members to contact the site administration from a central location. Users can specify a subject and message in the contact form, and also request that a copy of the e-mail be sent to their own address.') .'

              '; + $output .= '

              '. t("Users can activate/deactivate their personal contact forms in their account settings. Upon activation, a contact tab will appear in their user profiles. Privileged users such as site administrators are able to contact users even if they have chosen not to enable this feature.") .'

              '; + $output .= '

              '. t('If the menu module is enabled, a menu item linking to the site-wide contact page is added to the navigation block. It is disabled by default, but can be enabled via the menu management page. Links to the contact page may also be added to the primary and secondary links using the same page.', array('%menu-module' => url('admin/menu'))) .'

              '; + $output .= t('Contact module links:') .'
                '; + $output .= '
              • '. t('Default site-wide contact page.', array('%contact-page' => url('contact'))) .'
                • '; + $output .= '
              • '. t('Site-wide contact form category configuration.', array('%configuration-page' => url('admin/contact'))) .'
                • '; + $output .= '
              • '. t('Site-wide contact form general settings.', array('%additional-settings' => url('admin/contact/settings'))) .'
                • '; + $output .= '
              • '. t('Site-wide contact form menu configuration.', array('%menu-configuration' => url('admin/menu'))) .'
              '; + $output .= t('For more information, please read the configuration and customization handbook page for the contact module.', array('%contact' => url('http://drupal.org/handbook/modules/contact/', NULL, NULL, TRUE))); + return $output; + case 'admin/modules#description': + return t('Enables the use of both personal and site-wide contact forms.'); + case 'admin/contact': + $output = t('This page lets you setup your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('%settings' => url('admin/contact/settings'), '%form' => url('contact'))); + if (!module_exist('menu')) { + $menu_note = t('The menu item can be customized and configured only once the menu module has been enabled.', array('%modules-page' => url('admin/modules'))); + } + else { + $menu_note = ''; + } + $output .= '

              '. t('The contact module also adds a menu item (disabled by default) to the navigation block.', array('%menu-settings' => url('admin/menu'))) .' '. $menu_note .'

              '; + return($output); + } +} + +/** + * Implementation of hook_menu(). + */ +function contact_menu($may_cache) { + $items = array(); + if ($may_cache) { + $items[] = array('path' => 'admin/contact', + 'title' => t('contact form'), + 'callback' => 'contact_admin_categories', + 'access' => user_access('administer site configuration'), + ); + $items[] = array('path' => 'admin/contact/category', + 'title' => t('categories'), + 'callback' => 'contact_admin_categories', + 'access' => user_access('administer site configuration'), + 'type' => MENU_DEFAULT_LOCAL_TASK, + ); + $items[] = array('path' => 'admin/contact/category/list', + 'title' => t('list'), + 'callback' => 'contact_admin_categories', + 'access' => user_access('administer site configuration'), + 'type' => MENU_DEFAULT_LOCAL_TASK, + ); + $items[] = array('path' => 'admin/contact/category/add', + 'title' => t('add category'), + 'callback' => 'contact_admin_edit', + 'access' => user_access('administer site configuration'), + 'type' => MENU_LOCAL_TASK, + 'weight' => 1, + ); + $items[] = array('path' => 'admin/contact/category/edit', + 'title' => t('edit contact category'), + 'callback' => 'contact_admin_edit', + 'access' => user_access('administer site configuration'), + 'type' => MENU_CALLBACK, + ); + $items[] = array('path' => 'admin/contact/category/delete', + 'title' => t('delete contact'), + 'callback' => 'contact_admin_delete', + 'access' => user_access('administer site configuration'), + 'type' => MENU_CALLBACK, + ); + $items[] = array('path' => 'admin/contact/settings', + 'title' => t('settings'), + 'callback' => 'contact_admin_settings', + 'access' => user_access('administer site configuration'), + 'type' => MENU_LOCAL_TASK, + 'weight' => 1, + ); + $items[] = array('path' => 'contact', + 'title' => t('contact'), + 'callback' => 'contact_mail_page', + 'access' => user_access('access content'), + 'type' => MENU_SUGGESTED_ITEM, + ); + } + else { + if (arg(0) == 'user' && is_numeric(arg(1))) { + $items[] = array('path' => "user/". arg(1) ."/contact", + 'title' => t('contact'), + 'callback' => 'contact_mail_user', + 'type' => MENU_LOCAL_TASK, + 'weight' => 2, + ); + } + } + + return $items; +} + +/** + * Implementation of hook_user(). + * + * Allows the user the option of enabling/disabling his personal contact form. + */ +function contact_user($type, $edit, &$user, $category = NULL) { + if ($type == 'form' && $category == 'account') { + $form['contact'] = array('#type' => 'fieldset', + '#title' => t('Contact settings'), + '#weight' => 5, + '#collapsible' => TRUE, + ); + $form['contact']['contact'] = array('#type' => 'checkbox', + '#title' => t('Personal contact form'), + '#default_value' => $edit['contact'], + '#description' => t('Allow other users to contact you by e-mail via your personal contact form. Note that while your e-mail address is not made public to other members of the community, privileged users such as site administrators are able to contact you even if you choose not to enable this feature.', array('%url' => url("user/$user->uid/contact"))), + ); + return $form; + } + if ($type == 'validate') { + return array('contact' => $edit['contact']); + } +} + +/** + * Categories/list tab. + */ +function contact_admin_categories() { + $result = db_query('SELECT cid, category, recipients, selected FROM {contact} ORDER BY weight, category'); + $rows = array(); + while ($category = db_fetch_object($result)) { + $rows[] = array($category->category, $category->recipients, ($category->selected ? t('Yes') : t('No')), l(t('edit'), 'admin/contact/category/edit/'. $category->cid), l(t('delete'), 'admin/contact/category/delete/'. $category->cid)); + } + $header = array(t('Category'), t('Recipients'), t('Selected'), array('data' => t('Operations'), 'colspan' => 2)); + + return theme('table', $header, $rows); +} + +/** + * Category edit page. + */ +function contact_admin_edit($cid = NULL) { + if (arg(3) == "edit" && $cid > 0) { + $edit = db_fetch_array(db_query("SELECT * FROM {contact} WHERE cid = %d", $cid)); + } + $form['category'] = array('#type' => 'textfield', + '#title' => t('Category'), + '#maxlength' => 255, + '#default_value' => $edit['category'], + '#description' => t("Example: 'website feedback' or 'product information'."), + '#required' => TRUE, + ); + $form['recipients'] = array('#type' => 'textarea', + '#title' => t('Recipients'), + '#default_value' => $edit['recipients'], + '#description' => t("Example: 'webmaster@yoursite.com' or 'sales@yoursite.com'. To specify multiple recipients, separate each e-mail address with a comma."), + '#required' => TRUE, + ); + $form['reply'] = array('#type' => 'textarea', + '#title' => t('Auto-reply'), + '#default_value' => $edit['reply'], + '#description' => t('Optional auto-reply. Leave empty if you do not want to send the user an auto-reply message.'), + ); + $form['weight'] = array('#type' => 'weight', + '#title' => t('Weight'), + '#default_value' => $edit['weight'], + '#description' => t('When listing categories, those with lighter (smaller) weights get listed before categories with heavier (larger) weights. Categories with equal weights are sorted alphabetically.'), + ); + $form['selected'] = array('#type' => 'select', + '#title' => t('Selected'), + '#options' => array('0' => t('No'), '1' => t('Yes')), + '#default_value' => $edit['selected'], + '#description' => t('Set this to Yes if you would like this category to be selected by default.'), + ); + $form['cid'] = array('#type' => 'value', + '#value' => $edit['cid'], + ); + $form['submit'] = array('#type' => 'submit', + '#value' => t('Submit'), + ); + + return drupal_get_form('contact_admin_edit', $form); +} + +/** + * Validate the contact category edit page form submission. + */ +function contact_admin_edit_validate($form_id, $form_values) { + if (empty($form_values['category'])) { + form_set_error('category', t('You must enter a category.')); + } + if (empty($form_values['recipients'])) { + form_set_error('recipients', t('You must enter one or more recipients.')); + } + else { + $recipients = explode(',', $form_values['recipients']); + foreach($recipients as $recipient) { + if (!valid_email_address(trim($recipient))) { + form_set_error('recipients', t('%recipient is an invalid e-mail address.', array('%recipient' => theme('placeholder', $recipient)))); + } + } + } +} + +/** + * Process the contact category edit page form submission. + */ +function contact_admin_edit_submit($form_id, $form_values) { + if ($form_values['selected']) { + // Unselect all other contact categories. + db_query('UPDATE {contact} SET selected = 0'); + } + $recipients = explode(',', $form_values['recipients']); + foreach($recipients as $key=>$recipient) { + // E-mail address validation has already been done in _validate. + $recipients[$key] = trim($recipient); + } + $form_values['recipients'] = implode(',', $recipients); + if (arg(3) == 'add') { + db_query("INSERT INTO {contact} (category, recipients, reply, weight, selected) VALUES ('%s', '%s', '%s', %d, %d)", $form_values['category'], $form_values['recipients'], $form_values['reply'], $form_values['weight'], $form_values['selected']); + drupal_set_message(t('Category %category has been added.', array('%category' => theme('placeholder', $form_values['category'])))); + watchdog('mail', t('Contact form: category %category added.', array('%category' => theme('placeholder', $form_values['category']))), WATCHDOG_NOTICE, l(t('view'), 'admin/contact')); + + } + else { + db_query("UPDATE {contact} SET category = '%s', recipients = '%s', reply = '%s', weight = %d, selected = %d WHERE cid = %d", $form_values['category'], $form_values['recipients'], $form_values['reply'], $form_values['weight'], $form_values['selected'], $form_values['cid']); + drupal_set_message(t('Category %category has been updated.', array('%category' => theme('placeholder', $form_values['category'])))); + watchdog('mail', t('Contact form: category %category updated.', array('%category' => theme('placeholder', $form_values['category']))), WATCHDOG_NOTICE, l(t('view'), 'admin/contact')); + } + + return 'admin/contact'; +} + +/** + * Category delete page. + */ +function contact_admin_delete($cid = NULL) { + if ($info = db_fetch_object(db_query("SELECT category FROM {contact} WHERE cid = %d", $cid))) { + $form['category'] = array('#type' => 'value', + '#value' => $info->category, + ); + + return confirm_form('contact_admin_delete', $form, t('Are you sure you want to delete %category?', array('%category' => theme('placeholder', $info->category))), 'admin/contact', t('This action cannot be undone.'), t('Delete'), t('Cancel')); + } + else { + drupal_set_message(t('Category not found.'), 'error'); + drupal_goto('admin/contact'); + } +} + +/** + * Process category delete form submission. + */ +function contact_admin_delete_submit($form_id, $form_values) { + db_query("DELETE FROM {contact} WHERE cid = %d", arg(4)); + drupal_set_message(t('Category %category has been deleted.', array('%category' => theme('placeholder', $form_values['category'])))); + watchdog('mail', t('Contact form: category %category deleted.', array('%category' => theme('placeholder', $form_values['category']))), WATCHDOG_NOTICE); + + return 'admin/contact'; +} + +/** + * Settings tab. Using a form rather than hook_settings(). + */ +function contact_admin_settings() { + $form['contact_form_information'] = array('#type' => 'textarea', + '#title' => t('Additional information'), + '#default_value' => variable_get('contact_form_information', t('You can leave a message using the contact form below.')), + '#description' => t('Information to show on the contact page. Can be anything from submission guidelines to your postal address or telephone number.', array('%form' => url('contact'))), + ); + $form['contact_hourly_threshold'] = array('#type' => 'select', + '#title' => t('Hourly threshold'), + '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20, 30, 40, 50)), + '#default_value' => variable_get('contact_hourly_threshold', 3), + '#description' => t('The maximum number of contact form submissions a user can perform per hour.'), + ); + $form['submit'] = array('#type' => 'submit', + '#value' => t('Save configuration'), + ); + $form['reset'] = array('#type' => 'submit', + '#value' => t('Reset to defaults'), + ); + // Use system_settings_form for the callback. + return drupal_get_form('contact_admin_settings', $form, 'system_settings_form'); +} + +/** + * Personal contact page. + */ +function contact_mail_user() { + global $user; + + if ($account = user_load(array('uid' => arg(1)))) { + $admin_access = user_access('administer users'); + if (!$account->status && !$admin_access) { + drupal_access_denied(); + } + else if (!$account->contact && !$admin_access) { + $output = t('%name is not accepting e-mails.', array('%name' => $account->name)); + } + else if (!$user->uid) { + $output = t('Please login or register to send %name a message.', array('%login' => url('user/login'), '%register' => url('user/register'), '%name' => $account->name)); + } + else if (!valid_email_address($user->mail)) { + $output = t('You need to provide a valid e-mail address to contact other users. Please update your user information and try again.', array('%url' => url("user/$user->uid/edit"))); + } + else if (!flood_is_allowed('contact', variable_get('contact_hourly_threshold', 3))) { + $output = t('You cannot contact more than %number users per hour. Please try again later.', array('%number' => variable_get('contact_hourly_threshold', 3))); + } + else { + drupal_set_title($account->name); + + $form['#token'] = $user->name . $user->mail; + $form['from'] = array('#type' => 'item', + '#title' => t('From'), + '#value' => $user->name .' <'. $user->mail .'>', + ); + $form['to'] = array('#type' => 'item', + '#title' => t('To'), + '#value' => $account->name, + ); + $form['subject'] = array('#type' => 'textfield', + '#title' => t('Subject'), + '#maxlength' => 50, + '#required' => TRUE, + ); + $form['message'] = array('#type' => 'textarea', + '#title' => t('Message'), + '#rows' => 15, + '#required' => TRUE, + ); + $form['copy'] = array('#type' => 'checkbox', + '#title' => t('Send me a copy.'), + ); + $form['submit'] = array('#type' => 'submit', + '#value' => t('Send e-mail'), + ); + $output = drupal_get_form('contact_mail_user', $form); + } + + return $output; + } + else { + drupal_not_found(); + } +} + +/** + * Process the personal contact page form submission. + */ +function contact_mail_user_submit($form_id, $edit) { + global $user; + + $account = user_load(array('uid' => arg(1), 'status' => 1)); + // Compose the body: + $message[] = "$account->name,"; + $message[] = t("%name (%name-url) has sent you a message via your contact form (%form-url) at %site.", array('%name' => $user->name, '%name-url' => url("user/$user->uid", NULL, NULL, TRUE), '%form-url' => url($_GET['q'], NULL, NULL, TRUE), '%site' => variable_get('site_name', 'drupal'))); + $message[] = t("If you don't want to receive such e-mails, you can change your settings at %url.", array('%url' => url("user/$account->uid", NULL, NULL, TRUE))); + $message[] = t('Message:'); + $message[] = $edit['message']; + + // Tidy up the body: + foreach ($message as $key => $value) { + $message[$key] = wordwrap($value); + } + + // Prepare all fields: + $to = $account->mail; + $from = $user->mail; + + // Format the subject: + $subject = '['. variable_get('site_name', 'drupal') .'] '. $edit['subject']; + + // Prepare the body: + $body = implode("\n\n", $message); + + // Send the e-mail: + user_mail($to, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); + + // Send a copy if requested: + if ($edit['copy']) { + user_mail($from, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); + } + + // Log the operation: + flood_register_event('contact'); + watchdog('mail', t('%name-from sent %name-to an e-mail.', array('%name-from' => theme('placeholder', $user->name), '%name-to' => theme('placeholder', $account->name)))); + + // Set a status message: + drupal_set_message(t('The message has been sent.')); + + // Jump to the user's profile page: + return "user/$account->uid"; +} + +/** + * Site-wide contact page + */ +function contact_mail_page() { + global $user; + + if (!flood_is_allowed('contact', variable_get('contact_hourly_threshold', 3))) { + $output = t("You cannot send more than %number messages per hour. Please try again later.", array('%number' => variable_get('contact_hourly_threshold', 3))); + } + else { + if ($user->uid) { + $edit['name'] = $user->name; + $edit['mail'] = $user->mail; + } + + $result = db_query('SELECT cid, category, selected FROM {contact} ORDER BY weight, category'); + while ($category = db_fetch_object($result)) { + $categories[$category->cid] = $category->category; + if ($category->selected) { + $default_category = $category->cid; + } + } + + if (count($categories) > 0) { + $form['#token'] = $user->name . $user->mail; + $form['contact_information'] = array('#value' => filter_xss_admin(variable_get('contact_form_information', t('You can leave us a message using the contact form below.')))); + $form['name'] = array('#type' => 'textfield', + '#title' => t('Your name'), + '#maxlength' => 255, + '#default_value' => $edit['name'], + '#required' => TRUE, + ); + $form['mail'] = array('#type' => 'textfield', + '#title' => t('Your e-mail address'), + '#maxlength' => 255, + '#default_value' => $edit['mail'], + '#required' => TRUE, + ); + $form['subject'] = array('#type' => 'textfield', + '#title' => t('Subject'), + '#maxlength' => 255, + '#required' => TRUE, + ); + if (count($categories) > 1) { + // If there is more than one category available and no default category has been selected, + // prepend a default placeholder value. + if (!isset($default_category)) { + $categories = array(t('--')) + $categories; + } + $form['cid'] = array('#type' => 'select', + '#title' => t('Category'), + '#default_value' => $default_category, + '#options' => $categories, + '#required' => TRUE, + ); + } + else { + // If there is only one category, store its cid. + $category_keys = array_keys($categories); + $form['cid'] = array('#type' => 'value', + '#value' => array_shift($category_keys), + ); + } + $form['message'] = array('#type' => 'textarea', + '#title' => t('Message'), + '#required' => TRUE, + ); + $form['copy'] = array('#type' => 'checkbox', + '#title' => t('Send me a copy.'), + ); + $form['submit'] = array('#type' => 'submit', + '#value' => t('Send e-mail'), + ); + $output = drupal_get_form('contact_mail_page', $form); + } + else { + $output = t('The contact form has not been configured.'); + } + } + + return $output; +} + +/** + * Validate the site-wide contact page form submission. + */ +function contact_mail_page_validate($form_id, $form_values) { + if (!$form_values['cid']) { + form_set_error('category', t('You must select a valid category.')); + } + if (!valid_email_address($form_values['mail'])) { + form_set_error('mail', t('You must enter a valid e-mail address.')); + } +} + +/** + * Process the site-wide contact page form submission. + */ +function contact_mail_page_submit($form_id, $edit) { + + // E-mail address of the sender: as the form field is a text field, + // all instances of \r and \n have been automatically stripped from it. + $from = $edit['mail']; + + // Compose the body: + $message[] = t("%name sent a message using the contact form at %form.", array('%name' => $edit['name'], '%form' => url($_GET['q'], NULL, NULL, TRUE))); + $message[] = $edit['message']; + + // Tidy up the body: + foreach ($message as $key => $value) { + $message[$key] = wordwrap($value); + } + + // Load the category information: + $contact = db_fetch_object(db_query("SELECT * FROM {contact} WHERE cid = %d", $edit['cid'])); + + // Format the category: + $subject = t('[%category] %subject', array('%category' => $contact->category, '%subject' => $edit['subject'])); + + // Prepare the body: + $body = implode("\n\n", $message); + + // Send the e-mail to the recipients: + user_mail($contact->recipients, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); + + // If the user requests it, send a copy. + if ($edit['copy']) { + user_mail($from, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from"); + } + + // Send an auto-reply if necessary: + if ($contact->reply) { + user_mail($from, $subject, wordwrap($contact->reply), "From: $contact->recipients\nReply-to: $contact->recipients\nX-Mailer: Drupal\nReturn-path: $contact->recipients\nErrors-to: $contact->recipients"); + } + + // Log the operation: + flood_register_event('contact'); + watchdog('mail', t('%name-from sent an e-mail regarding %category.', array('%name-from' => theme('placeholder', $edit['name'] ." <$from>"), '%category' => theme('placeholder', $contact->category)))); + + // Update user: + drupal_set_message(t('Your message has been sent.')); + + // Jump to home page rather than back to contact page to avoid contradictory messages if flood control has been activated. + return(''); +} diff --git a/modules/drupal.module b/modules/drupal.module new file mode 100644 index 0000000..d47d004 --- /dev/null +++ b/modules/drupal.module @@ -0,0 +1,364 @@ +'. t('The Drupal module uses the XML-RPC network communication protocol to connect your site with a central server that maintains a directory of client sites.') .'

              '; + $output .= t('

              Enabling the Drupal module will allow you to:

              +
                +
              • register your site with a server, including (optionally) posting information on your installed modules and themes and summary statistics on your number of posts and users, information that can help rank Drupal modules and themes
                • +
              • enable other sites to register with your site
                • +
              • allow members on all sites using the Drupal module to log in to your site without registering using their distributed identification
                • +
              • allow members to log in to any other site that uses the Drupal module, using a login name that looks much like an e-mail address: username@example.com
                • +
              +'); + $output .= '

              '. t('The Drupal module administration page allows you to set the xml-rpc server page and other related options.') .'

              '; + $output .= t('

              You can

              + +', array('%file-cron' => 'cron.php', '%file-xmlrpc' => 'xmlrpc.php', '%admin-settings-drupal' => url('admin/settings/drupal'))); + $output .= '

              '. t('If you maintain a directory of sites, you can list them on a page using the drupal_client_page() function. Sample instructions: +

                +
              • Enable the page module. Select create content >> page.
                • +
              • For input format, select PHP code.
                • +
              • Give the page a title. For body, put: +
                +<?php
+print drupal_client_page();
+?>
+
                +
              • Save the page.
                • +
              ') . '

              '; + + $output .= '

              '. t('For more information please read the configuration and customization handbook Drupal page.', array('%drupal' => 'http://drupal.org/handbook/modules/drupal/')) .'

              '; + return $output; + case 'admin/modules#description': + return t('Lets you register your site with a central server and improve ranking of Drupal projects by posting information on your installed modules and themes; also enables users to log in using a Drupal ID.'); + case 'admin/settings/drupal': + return t('

              Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the settings page and set the site name, the e-mail address, the slogan, and the mission statement.

              ', array('%site-settings' => url('admin/settings'))); + case 'user/help#drupal': + return variable_get('drupal_authentication_service', 0) ? t("

              Drupal is the name of the software that powers %this-site. There are Drupal web sites all over the world, and many of them share their registration databases so that users may freely log in to any Drupal site using a single Drupal ID.

              +

              So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: username@server. An example of a valid Drupal ID is mwlily@drupal.org.

              ", array('%Drupal' => 'http://drupal.org', '%this-site' => ''. variable_get('site_name', 'this web site') .'')) : ''; + } +} + +/** + * Implementation of hook_settings(). + */ +function drupal_settings() { + // Check if all required fields are present + if ((variable_get('site_name', 'drupal') == 'drupal') || (variable_get('site_name', 'drupal') == '')) { + form_set_error('drupal_directory', t('You must set the name of your site on the administer » settings page.', array('%url' => url('admin/settings')))); + } + else if (variable_get('site_mail', ini_get('sendmail_from')) == '') { + form_set_error('drupal_directory', t('You must set an e-mail address for your site on the administer » settings page.', array('%url' => url('admin/settings')))); + } + else if (variable_get('site_slogan', '') == '') { + form_set_error('drupal_directory', t('You must set your site slogan on the administer » settings page.', array('%url' => url('admin/settings')))); + } + else if (variable_get('site_mission', '') == '') { + form_set_error('drupal_directory', t('You must set your site mission on the administer » settings page.' , array('%url' => url('admin/settings')))); + } + $options = array('1' => t('Enabled'), '0' => t('Disabled')); + + $form['drupal'] = array( + '#type' => 'fieldset', + '#title' => t('Post data to another site'), + '#tree' => FALSE + ); + + $form['drupal']['drupal_register'] = array( + '#type' => 'radios', + '#title' => t('Register with a Drupal server'), + '#default_value' => variable_get('drupal_register', 0), + '#options' => $options, + '#description' => t("If enabled, your Drupal site will register itself with the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the \"Drupal XML-RPC server\" field is set to \"%drupal-xml-rpc\", your web site will register itself with drupal.org. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://drupal.org/xmlrpc.php", "%drupal-sites" => "http://drupal.org/drupal-sites/")) + ); + + $form['drupal']['drupal_server'] = array( + '#type' => 'textfield', + '#title' => t('Drupal XML-RPC server'), + '#default_value' => variable_get('drupal_server', 'http://drupal.org/xmlrpc.php'), + '#description' => t('The URL of the Drupal XML-RPC server you wish to register with.') + ); + + $form['drupal']['drupal_system'] = array( + '#type' => 'radios', + '#title' => t('Send system information'), + '#default_value' => variable_get('drupal_system', 0), + '#options' => $options, + '#description' => t("If enabled, your site will send information on its installed components (modules, themes, and theme engines). This information can help in compiling statistics on usage of Drupal projects.") + ); + + $form['drupal']['drupal_statistics'] = array( + '#type' => 'radios', + '#title' => t('Send statistics'), + '#default_value' => variable_get('drupal_statistics', 0), + '#options' => $options, + '#description' => t("If enabled, your site will send summary statistics on the number of registered users and the total number of posts. No private information will be sent. These data help to improve the ranking statistics of Drupal projects.") + ); + + $form['services'] = array( + '#type' => 'fieldset', + '#title' => t('Receive data from other sites'), + '#tree' => FALSE + ); + + $form['services']['drupal_client_service'] = array( + '#type' => 'radios', + '#title' => t('Allow other Drupal sites to register'), + '#default_value' => variable_get('drupal_client_service', 0), + '#options' => $options, + '#description' => t('If enabled, your Drupal site will allow other sites to register with your site and send information to this site. This functionality can be used to maintain a list of related sites.') + ); + + $form['services']['drupal_authentication_service'] = array( + '#type' => 'radios', + '#title' => t('Authentication service'), + '#default_value' => variable_get('drupal_authentication_service', 0), + '#options' => $options, + '#description' => t('If enabled, your Drupal site will accept logins with the user names of other Drupal sites, and likewise provide authentication for users logging into other Drupal sites, based on their user accounts here.') + ); + + return $form; +} + +/** + * Implementation of hook_cron(); handles pings to and from the site. + */ +function drupal_cron() { + if (time() - variable_get('cron_last', 0) > 21600) { + + // If this site acts as a Drupal XML-RPC server, delete the sites that + // stopped sending "ping" messages. + if (variable_get('drupal_client_service', 0)) { + $result = db_query("SELECT cid FROM {client} WHERE changed < %d", time() - 259200); + while ($client = db_fetch_object($result)) { + db_query("DELETE FROM {client_system} WHERE cid = %d", $client->cid); + db_query("DELETE FROM {client} WHERE cid = %d", $client->cid); + } + } + + // If this site acts as a Drupal XML-RPC client, send a message to the + // Drupal XML-RPC server. + if (variable_get('drupal_register', 0) && variable_get('drupal_server', 0)) { + drupal_notify(variable_get('drupal_server', '')); + } + } +} + +/** + * Callback function from drupal_xmlrpc() called when another site pings this one. + */ +function drupal_client_ping($client, $system) { + /* + ** Parse our parameters: + */ + + foreach (array('link', 'name', 'mail', 'slogan', 'mission') as $key) { + $client[$key] = strip_tags($client[$key]); + } + + /* + ** Update the data in our database and send back a reply: + */ + + if ($client['link'] && $client['name'] && $client['mail'] && $client['slogan'] && $client['mission']) { + $result = db_query(db_rewrite_sql("SELECT cid FROM {client} WHERE link = '%s'"), $client['link']); + if (db_num_rows($result)) { + $record = db_fetch_object($result); + $client['cid'] = $record->cid; + // We have an existing record. + db_query("UPDATE {client} SET link = '%s', name = '%s', mail = '%s', slogan = '%s', mission = '%s', users = %d, nodes = %d, version = '%s', changed = '%s' WHERE cid = %d", $client['uid'], $client['link'], $client['name'], $client['mail'], $client['slogan'], $client['mission'], $client['users'], $client['nodes'], $client['version'], time(), $client['cid']); + } + else { + $client['cid'] = db_next_id('{client}_cid'); + db_query("INSERT INTO {client} (cid, link, name, mail, slogan, mission, users, nodes, version, created, changed) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", $client['cid'], $client['link'], $client['name'], $client['mail'], $client['slogan'], $client['mission'], $client['users'], $client['nodes'], $client['version'], time(), time()); + } + if (is_array($system)) { + db_query("DELETE FROM {client_system} WHERE cid = %d", $client['cid']); + foreach ($system as $item) { + db_query("INSERT INTO {client_system} (cid, name, type) VALUES (%d, '%s', '%s')", $client['cid'], $item['name'], $item['type']); + } + } + watchdog('client ping', t('Ping from %name (%link).', array('%name' => theme('placeholder', $client['name']), '%link' => theme('placeholder', $client['link']))), WATCHDOG_NOTICE, 'view'); + + return TRUE; + } + else { + return 0; + } + +} + +/** + * Formats a list of all clients. + * + * This function may be called from a custom page on sites that are + * Drupal directory servers. + */ +function drupal_client_page($sort = 'name') { + $result = db_query('SELECT * FROM {client} ORDER BY %s', $sort); + + $clients = array(); + while ($client = db_fetch_object($result)) { + $clients[] = $client; + } + + return theme('client_list', $clients); +} + +/** + * Theme a client list. + */ +function theme_client_list($clients) { + // Note: All fields except the mission are treated as plain-text. + // The mission is stripped of any HTML tags to keep the output simple and consistent. + $output = "\n
              \n"; + foreach ($clients as $client) { + $output .= '
              ' . check_plain($client->name) . ' - ' . check_plain($client->slogan) . "
              \n"; + $output .= '
              ' . strip_tags($client->mission) . "
              \n"; + } + $output .= "
              \n"; + return $output; +} + +/** + * Implementation of hook_xmlrpc(). + */ +function drupal_xmlrpc() { + $xmlrpc = array(); + if (variable_get('drupal_client_service', 0)) { + $xmlrpc[] = array( + 'drupal.client.ping', + 'drupal_client_ping', + array('array', 'array', 'array'), + t('Handling ping request') + ); + } + if (variable_get('drupal_authentication_service', 0)) { + $xmlrpc[] = array( + 'drupal.login', + 'drupal_login', + array('int', 'string', 'string'), + t('Logging into a Drupal site') + ); + } + return $xmlrpc; +} + +/** + * Sends a ping to the Drupal directory server. + */ +function drupal_notify($server) { + global $base_url; + $client = array( + 'link' => $base_url, + 'name' => variable_get('site_name', ''), + 'mail' => variable_get('site_mail', ''), + 'slogan' => variable_get('site_slogan', ''), + 'mission' => variable_get('site_mission', ''), + 'version' => VERSION + ); + if (variable_get('drupal_system', 0)) { + $system = array(); + $result = db_query("SELECT name, type FROM {system} WHERE status = 1"); + while ($item = db_fetch_array($result)) { + $system[] = $item; + } + } + if (variable_get('drupal_statistics', 0)) { + $users = db_fetch_object(db_query("SELECT COUNT(uid) AS count FROM {users}")); + $client['users'] = $users->count; + $nodes = db_fetch_object(db_query("SELECT COUNT(nid) AS count FROM {node}")); + $client['nodes'] = $nodes->count; + } + $result = xmlrpc($server, 'drupal.client.ping', $client, $system); + + if ($result === FALSE) { + watchdog('server ping', t('Failed to notify %server; error code: %errno; error message: %error_msg.', array('%server' => theme('placeholder', $server), '%errno' => theme('placeholder', xmlrpc_errno()), '%error_msg' => theme('placeholder', xmlrpc_error_msg()))), WATCHDOG_WARNING); + } +} + +/** + * Implementation of hook_info(). + */ +function drupal_info($field = 0) { + $info['name'] = 'Drupal'; + $info['protocol'] = 'XML-RPC'; + + if ($field) { + return $info[$field]; + } + else { + return $info; + } +} + +/** + * Implementation of hook_auth(). + */ +function drupal_auth($username, $password, $server) { + if (variable_get('drupal_authentication_service', 0)) { + $result = xmlrpc("http://$server/xmlrpc.php", 'drupal.login', $username, $password); + if ($result === FALSE) { + drupal_set_message(t('Error %code : %message', array('%code' => theme('placeholder', xmlrpc_errno()), '%message' => theme('placeholder', xmlrpc_error_msg()))), 'error'); + } + else { + return $result; + } + } +} + +/** + * Implementation of hook_menu(). + */ +function drupal_menu($may_cache) { + $items = array(); + if ($may_cache) { + if (variable_get('drupal_authentication_service', 0)) { + $items[] = array('path' => 'drupal', 'title' => t('Drupal'), + 'callback' => 'drupal_page_help', 'access' => TRUE, + 'type' => MENU_SUGGESTED_ITEM + ); + } + } + return $items; +} + +/** + * Menu callback; print Drupal-authentication-specific information from user/help. + */ +function drupal_page_help() { + return drupal_help('user/help#drupal'); +} + +/** + * Callback function from drupal_xmlrpc() for authenticating remote clients. + * + * Remote clients are usually other Drupal instances. + */ +function drupal_login($username, $password) { + if (variable_get('drupal_authentication_service', 0)) { + if ($user = user_load(array('name' => $username, 'pass' => $password, 'status' => 1))) { + return $user->uid; + } + else { + return 0; + } + } +} + + diff --git a/modules/filter.module b/modules/filter.module new file mode 100644 index 0000000..2172d37 --- /dev/null +++ b/modules/filter.module @@ -0,0 +1,1372 @@ +'. t('The filter module allows administrators to configure text input formats for the site. For example, an administrator may want a filter to strip out malicious HTML from user\'s comments. Administrators may also want to make URLs linkable even if they are only entered in an unlinked format.') .'

              '; + $output .= '

              '. t('Users can choose between the available input formats when creating or editing content. Administrators can configure which input formats are available to which user roles, as well as choose a default input format. Administrators can also create new input formats. Each input format can be configured to use a selection of filters.') .'

              '; + $output .= t('

              You can

              + +', array('%admin-filters' => url('admin/filters'))); + $output .= '

              '. t('For more information please read the configuration and customization handbook Filter page.', array('%filter' => 'http://drupal.org/handbook/modules/filter/')) .'

              '; + return $output; + case 'admin/modules#description': + return t('Handles the filtering of content in preparation for display.'); + + case 'admin/filters': + return t(' +

              Input formats define a way of processing user-supplied text in Drupal. Every input format has its own settings of which filters to apply. Possible filters include stripping out malicious HTML and making URLs clickable.

              +

              Users can choose between the available input formats when submitting content.

              +

              Below you can configure which input formats are available to which roles, as well as choose a default input format (used for imported content, for example).

              +

              Note that (1) the default format is always available to all roles, and (2) all filter formats can always be used by roles with the "administer filters" permission even if they are not explicitly listed in the Roles column of this table.

              '); + + case 'admin/filters/'. arg(2): + return t(' +

              Every filter performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this input format.

              +

              If you notice some filters are causing conflicts in the output, you can rearrange them.

              ', array('%rearrange' => url('admin/filters/'. arg(2) .'/order'))); + + case 'admin/filters/'. arg(2) .'/configure': + return t(' +

              If you cannot find the settings for a certain filter, make sure you\'ve enabled it on the view tab first.

              ', array('%url' => url('admin/filters/'. arg(2)))); + + case 'admin/filters/'. arg(2) .'/order': + return t(' +

              Because of the flexible filtering system, you might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted in a clickable link. When this happens, you will need to rearrange the order in which filters get executed.

              +

              Filters are executed from top-to-bottom. You can use the weight column to rearrange them: heavier filters \'sink\' to the bottom.

              '); + } +} + +/** + * Implementation of hook_menu(). + */ +function filter_menu($may_cache) { + $items = array(); + + if ($may_cache) { + $items[] = array('path' => 'admin/filters', + 'title' => t('input formats'), + 'callback' => 'filter_admin_overview', + 'access' => user_access('administer filters'), + ); + $items[] = array('path' => 'admin/filters/list', + 'title' => t('list'), + 'callback' => 'filter_admin_overview', + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'access' => user_access('administer filters'), + ); + $items[] = array('path' => 'admin/filters/add', + 'title' => t('add input format'), + 'callback' => 'filter_admin_format_form', + 'type' => MENU_LOCAL_TASK, + 'weight' => 1, + 'access' => user_access('administer filters'), + ); + $items[] = array('path' => 'admin/filters/delete', + 'title' => t('delete input format'), + 'callback' => 'filter_admin_delete', + 'type' => MENU_CALLBACK, + 'access' => user_access('administer filters'), + ); + $items[] = array('path' => 'filter/tips', + 'title' => t('compose tips'), + 'callback' => 'filter_tips_long', + 'access' => TRUE, + 'type' => MENU_SUGGESTED_ITEM, + ); + } + else { + if (arg(0) == 'admin' && arg(1) == 'filters' && is_numeric(arg(2))) { + $formats = filter_formats(); + + if (isset($formats[arg(2)])) { + $items[] = array('path' => 'admin/filters/'. arg(2), + 'title' => t("'%format' input format", array('%format' => $formats[arg(2)]->name)), + 'callback' => 'filter_admin_format_form', + 'callback arguments' => array('format' => $formats[arg(2)]), + 'type' => MENU_CALLBACK, + 'access' => user_access('administer filters'), + ); + $items[] = array('path' => 'admin/filters/'. arg(2) .'/list', + 'title' => t('view'), + 'callback' => 'filter_admin_format_form', + 'callback arguments' => array('format' => $formats[arg(2)]), + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => 0, + 'access' => user_access('administer filters'), + ); + $items[] = array('path' => 'admin/filters/'. arg(2) .'/configure', + 'title' => t('configure'), + 'callback' => 'filter_admin_configure', + 'type' => MENU_LOCAL_TASK, + 'weight' => 1, + 'access' => user_access('administer filters'), + ); + $items[] = array('path' => 'admin/filters/'. arg(2) .'/order', + 'title' => t('rearrange'), + 'callback' => 'filter_admin_order', + 'callback arguments' => array('format' => $formats[arg(2)]), + 'type' => MENU_LOCAL_TASK, + 'weight' => 2, + 'access' => user_access('administer filters'), + ); + } + } + } + + return $items; +} + +/** + * Implementation of hook_perm(). + */ +function filter_perm() { + return array('administer filters'); +} + +/** + * Implementation of hook_filter_tips(). + */ +function filter_filter_tips($delta, $format, $long = false) { + global $base_url; + switch ($delta) { + case 0: + if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) { + if ($allowed_html = variable_get("allowed_html_$format", '
                1. ')) { + switch ($long) { + case 0: + return t('Allowed HTML tags') .': '. check_plain($allowed_html); + case 1: + $output = '

                  '. t('Allowed HTML tags') .': '. check_plain($allowed_html) .'

                  '; + if (!variable_get("filter_html_help_$format", 1)) { + return $output; + } + + $output .= t(' +

                  This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.

                  +

                  For more information see W3C\'s HTML Specifications or use your favorite search engine to find other sites that explain HTML.

                  '); + $tips = array( + 'a' => array( t('Anchors are used to make links to other pages.'), ''. variable_get('site_name', 'drupal') .''), + 'br' => array( t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), t('Text with
                  line break')), + 'p' => array( t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '

                  '. t('Paragraph one.') .'

                  '. t('Paragraph two.') .'

                  '), + 'strong' => array( t('Strong'), ''. t('Strong'). ''), + 'em' => array( t('Emphasized'), ''. t('Emphasized') .''), + 'cite' => array( t('Cited'), ''. t('Cited') .''), + 'code' => array( t('Coded text used to show programming source code'), ''. t('Coded') .''), + 'b' => array( t('Bolded'), ''. t('Bolded') .''), + 'u' => array( t('Underlined'), ''. t('Underlined') .''), + 'i' => array( t('Italicized'), ''. t('Italicized') .''), + 'sup' => array( t('Superscripted'), t('Superscripted')), + 'sub' => array( t('Subscripted'), t('Subscripted')), + 'pre' => array( t('Preformatted'), '
                  '. t('Preformatted') .'
                  '), + 'abbr' => array( t('Abbreviation'), t('Abbrev.')), + 'acronym' => array( t('Acronym'), t('TLA')), + 'blockquote' => array( t('Block quoted'), '
                  '. t('Block quoted') .'
                  '), + 'q' => array( t('Quoted inline'), ''. t('Quoted inline') .''), + // Assumes and describes tr, td, th. + 'table' => array( t('Table'), '
                  '. t('Table header') .'
                  '. t('Table cell') .'
                  '), + 'tr' => NULL, 'td' => NULL, 'th' => NULL, + 'del' => array( t('Deleted'), ''. t('Deleted') .''), + 'ins' => array( t('Inserted'), ''. t('Inserted') .''), + // Assumes and describes li. + 'ol' => array( t('Ordered list - use the <li> to begin each list item'), '
                  1. '. t('First item') .'
                  2. '. t('Second item') .'
                  '), + 'ul' => array( t('Unordered list - use the <li> to begin each list item'), '
                  • '. t('First item') .'
                  • '. t('Second item') .'
                  '), + 'li' => NULL, + // Assumes and describes dt and dd. + 'dl' => array( t('Definition lists are similar to other HTML lists. <dl> begins the definition list, <dt> begins the definition term and <dd> begins the definition description.'), '
                  '. t('First term') .'
                  '. t('First definition') .'
                  '. t('Second term') .'
                  '. t('Second definition') .'
                  '), + 'dt' => NULL, 'dd' => NULL, + 'h1' => array( t('Header'), '

                  '. t('Title') .'

                  '), + 'h2' => array( t('Header'), '

                  '. t('Subtitle') .'

                  '), + 'h3' => array( t('Header'), '

                  '. t('Subtitle three') .'

                  '), + 'h4' => array( t('Header'), '

                  '. t('Subtitle four') .'

                  '), + 'h5' => array( t('Header'), '
                  '. t('Subtitle five') .'
                  '), + 'h6' => array( t('Header'), '
                  '. t('Subtitle six') .'
                  ') + ); + $header = array(t('Tag Description'), t('You Type'), t('You Get')); + preg_match_all('/<([a-z0-9]+)[^a-z0-9]/i', $allowed_html, $out); + foreach ($out[1] as $tag) { + if (array_key_exists($tag, $tips)) { + if ($tips[$tag]) { + $rows[] = array( + array('data' => $tips[$tag][0], 'class' => 'description'), + array('data' => ''. check_plain($tips[$tag][1]) .'', 'class' => 'type'), + array('data' => $tips[$tag][1], 'class' => 'get') + ); + } + } + else { + $rows[] = array( + array('data' => t('No help provided for tag %tag.', array('%tag' => check_plain($tag))), 'class' => 'description', 'colspan' => 3), + ); + } + } + $output .= theme('table', $header, $rows); + + $output .= t(' +

                  Most unusual characters can be directly entered without any problems.

                  +

                  If you do encounter problems, try using HTML character entities. A common example looks like &amp; for an ampersand & character. For a full list of entities see HTML\'s entities page. Some of the available characters include:

                  '); + $entities = array( + array( t('Ampersand'), '&'), + array( t('Greater than'), '>'), + array( t('Less than'), '<'), + array( t('Quotation mark'), '"'), + ); + $header = array(t('Character Description'), t('You Type'), t('You Get')); + unset($rows); + foreach ($entities as $entity) { + $rows[] = array( + array('data' => $entity[0], 'class' => 'description'), + array('data' => ''. check_plain($entity[1]) .'', 'class' => 'type'), + array('data' => $entity[1], 'class' => 'get') + ); + } + $output .= theme('table', $header, $rows); + return $output; + } + } + else { + return t('No HTML tags allowed'); + } + } + break; + + case 1: + switch ($long) { + case 0: + return t('You may post PHP code. You should include <?php ?> tags.'); + case 1: + return t(' +

                  Using custom PHP code

                  +

                  If you know how to script in PHP, Drupal gives you the power to embed any script you like. It will be executed when the page is viewed and dynamically embedded into the page. This gives you amazing flexibility and power, but of course with that comes danger and insecurity if you don\'t write good code. If you are not familiar with PHP, SQL or with the site engine, avoid experimenting with PHP because you can corrupt your database or render your site insecure or even unusable! If you don\'t plan to do fancy stuff with your content then you\'re probably better off with straight HTML.

                  +

                  Remember that the code within each PHP item must be valid PHP code - including things like correctly terminating statements with a semicolon. It is highly recommended that you develop your code separately using a simple test script on top of a test database before migrating to your production environment.

                  +

                  Notes:

                  • You can use global variables, such as configuration parameters, within the scope of your PHP code but remember that global variables which have been given values in your code will retain these values in the engine afterwards.
                  • register_globals is now set to off by default. If you need form information you need to get it from the "superglobals" $_POST, $_GET, etc.
                  • You can either use the print or return statement to output the actual content for your item.
                  +

                  A basic example:

                  +

                  You want to have a box with the title "Welcome" that you use to greet your visitors. The content for this box could be created by going:

                  +
                  +  print t("Welcome visitor, ... welcome message goes here ...");
+
                  +

                  If we are however dealing with a registered user, we can customize the message by using:

                  +
                  +  global $user;
+  if ($user->uid) {
+    print t("Welcome $user->name, ... welcome message goes here ...");
+  }
+  else {
+    print t("Welcome visitor, ... welcome message goes here ...");
+  }
+
                  +

                  For more in-depth examples, we recommend that you check the existing Drupal code and use it as a starting point, especially for sidebar boxes.

                  '); + } + + case 2: + switch ($long) { + case 0: + return t('Lines and paragraphs break automatically.'); + case 1: + return t('Lines and paragraphs are automatically recognized. The <br /> line break, <p> paragraph and </p> close paragraph tags are inserted automatically. If paragraphs are not recognized simply add a couple blank lines.'); + } + } +} + +/** + * Displays a list of all input formats and which one is the default + */ +function filter_admin_overview() { + + // Overview of all formats. + $formats = filter_formats(); + $error = false; + + $rows = array(); + foreach ($formats as $id => $format) { + $roles = array(); + foreach (user_roles() as $rid => $name) { + // Prepare a roles array with roles that may access the filter + if (strstr($format->roles, ",$rid,")) { + $roles[] = $name; + } + } + $row = array(); + $default = ($id == variable_get('filter_default_format', 1)); + $options[$id] = ''; + $form[$format->name]['id'] = array('#value' => $id); + $form[$format->name]['roles'] = array('#value' => $default ? t('All roles may use default format') : ($roles ? implode(', ',$roles) : t('No roles may use this format'))); + $form[$format->name]['configure'] = array('#value' => l(t('configure'), 'admin/filters/'. $id)); + $form[$format->name]['delete'] = array('#value' => $default ? '' : l(t('delete'), 'admin/filters/delete/'. $id)); + } + $form['default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('filter_default_format', 1)); + $form['submit'] = array('#type' => 'submit', '#value' => t('Set default format')); + return drupal_get_form('filter_admin_overview', $form); +} + +function filter_admin_overview_submit($form_id, $form_values) { + // Process form submission to set the default format + if (is_numeric($form_values['default'])) { + drupal_set_message(t('Default format updated.')); + variable_set('filter_default_format', $form_values['default']); + } +} + +function theme_filter_admin_overview($form) { + foreach ($form as $name => $element) { + if (isset($element['roles']) && is_array($element['roles'])) { + $rows[] = array( + form_render($form['default'][$element['id']['#value']]), + check_plain($name), + form_render($element['roles']), + form_render($element['configure']), + form_render($element['delete']) + ); + unset($form[$name]); + } + } + $header = array(t('Default'), t('Name'), t('Roles'), array('data' => t('Operations'), 'colspan' => 2)); + $output = theme('table', $header, $rows); + $output .= form_render($form); + + return $output; +} + +/** + * Menu callback; confirm deletion of a format. + */ +function filter_admin_delete() { + $format = arg(3); + $format = db_fetch_object(db_query('SELECT * FROM {filter_formats} WHERE format = %d', $format)); + + if ($format) { + if ($format->format != variable_get('filter_default_format', 1)) { + $form['format'] = array('#type' => 'hidden', '#value' => $format->format); + $form['name'] = array('#type' => 'hidden', '#value' => $format->name); + + return confirm_form('filter_admin_delete', $form, t('Are you sure you want to delete the input format %format?', array('%format' => theme('placeholder', $format->name))), 'admin/filters', t('If you have any content left in this input format, it will be switched to the default input format. This action cannot be undone.'), t('Delete'), t('Cancel')); + } + else { + drupal_set_message(t('The default format cannot be deleted.')); + drupal_goto('admin/filters'); + } + } + else { + drupal_not_found(); + } +} + +/** + * Process filter delete form submission. + */ +function filter_admin_delete_submit($form_id, $form_values) { + db_query("DELETE FROM {filter_formats} WHERE format = %d", $form_values['format']); + db_query("DELETE FROM {filters} WHERE format = %d", $form_values['format']); + + $default = variable_get('filter_default_format', 1); + // Replace existing instances of the deleted format with the default format. + db_query("UPDATE {node_revisions} SET format = %d WHERE format = %d", $default, $form_values['format']); + db_query("UPDATE {comments} SET format = %d WHERE format = %d", $default, $form_values['format']); + db_query("UPDATE {boxes} SET format = %d WHERE format = %d", $default, $form_values['format']); + + cache_clear_all('filter:'. $form_values['format'], true); + drupal_set_message(t('Deleted input format %format.', array('%format' => theme('placeholder', $form_values['name'])))); + + return 'admin/filters'; +} + +/** + * Generate a filter format form. + */ +function filter_admin_format_form($format = NULL) { + $default = ($format->format == variable_get('filter_default_format', 1)); + if ($default) { + $help = t('All roles for the default format must be enabled and cannot be changed.'); + $form['default_format'] = array('#type' => 'hidden', '#value' => 1); + } + + $form['name'] = array('#type' => 'textfield', + '#title' => 'Name', + '#default_value' => $format->name, + '#description' => t('Specify a unique name for this filter format.'), + '#required' => TRUE, + ); + + // Add a row of checkboxes for form group. + $form['roles'] = array('#type' => 'fieldset', + '#title' => t('Roles'), + '#description' => $default ? $help : t('Choose which roles may use this filter format. Note that roles with the "administer filters" permission can always use all the filter formats.'), + '#tree' => TRUE, + ); + + foreach (user_roles() as $rid => $name) { + $checked = strstr($format->roles, ",$rid,"); + $form['roles'][$rid] = array('#type' => 'checkbox', + '#title' => $name, + '#default_value' => ($default || $checked), + ); + if ($default) { + $form['roles'][$rid]['#attributes'] = array('disabled' => 'disabled'); + } + } + // Table with filters + $all = filter_list_all(); + $enabled = filter_list_format($format->format); + + $form['filters'] = array('#type' => 'fieldset', + '#title' => t('Filters'), + '#description' => t('Choose the filters that will be used in this filter format.'), + '#tree' => TRUE, + ); + foreach ($all as $id => $filter) { + $form['filters'][$id] = array('#type' => 'checkbox', + '#title' => $filter->name, + '#default_value' => isset($enabled[$id]), + '#description' => module_invoke($filter->module, 'filter', 'description', $filter->delta), + ); + } + $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + + if (isset($format)) { + $form['format'] = array('#type' => 'hidden', '#value' => $format->format); + + // Composition tips (guidelines) + $tips = _filter_tips($format->format, false); + $extra = l(t('More information about formatting options'), 'filter/tips'); + $tiplist = theme('filter_tips', $tips, false, $extra); + if (!$tiplist) { + $tiplist = t('

                  No guidelines available.

                  '); + } + $group = t('

                  These are the guidelines that users will see for posting in this input format. They are automatically generated from the filter settings.

                  '); + $group .= $tiplist; + $output = '

                  '. t('Formatting guidelines') .'

                  '. $group; + } + $output = drupal_get_form('filter_admin_format_form', $form) . $output; + + return $output; +} + +/** + * Validate filter format form submissions. + */ +function filter_admin_format_form_validate($form_id, $form_values) { + if (!isset($form_values['format'])) { + $name = trim($form_values['name']); + $result = db_fetch_object(db_query("SELECT format FROM {filter_formats} WHERE name='%s'", $name)); + if ($result) { + form_set_error('name', t('Filter format names need to be unique. A format named %name already exists.', array('%name' => theme('placeholder', $name)))); + } + } +} + +/** + * Process filter format form submissions. + */ +function filter_admin_format_form_submit($form_id, $form_values) { + $format = isset($form_values['format']) ? $form_values['format'] : NULL; + $current = filter_list_format($format); + $name = trim($form_values['name']); + $cache = TRUE; + + // Add a new filter format. + if (!$format) { + $new = TRUE; + db_query("INSERT INTO {filter_formats} (name) VALUES ('%s')", $name); + $result = db_fetch_object(db_query("SELECT MAX(format) AS format FROM {filter_formats}")); + $format = $result->format; + drupal_set_message(t('Added input format %format.', array('%format' => theme('placeholder', $name)))); + } + else { + drupal_set_message(t('The input format settings have been updated.')); + } + + db_query("DELETE FROM {filters} WHERE format = %d", $format); + foreach ($form_values['filters'] as $id => $checked) { + if ($checked) { + list($module, $delta) = explode('/', $id); + // Add new filters to the bottom. + $weight = isset($current[$id]->weight) ? $current[$id]->weight : 10; + db_query("INSERT INTO {filters} (format, module, delta, weight) VALUES (%d, '%s', %d, %d)", $format, $module, $delta, $weight); + + // Check if there are any 'no cache' filters. + $cache &= !module_invoke($module, 'filter', 'no cache', $delta); + } + } + + // We store the roles as a string for ease of use. + // We should always set all roles to true when saving a default role. + // We use leading and trailing comma's to allow easy substring matching. + $roles = array(); + if (isset($form_values['roles'])) { + foreach ($form_values['roles'] as $id => $checked) { + if ($checked) { + $roles[] = $id; + } + } + } + $roles = ','. implode(',', ($form_values['default_format'] ? user_roles() : $roles)) .','; + + db_query("UPDATE {filter_formats} SET cache = %d, name='%s', roles = '%s' WHERE format = %d", $cache, $name, $roles, $format); + + cache_clear_all('filter:'. $format, true); + + // If a new filter was added, return to the main list of filters. Otherwise, stay on edit filter page to show new changes. + if ($new) { + return 'admin/filters/'; + } + else { + return 'admin/filters/'. $format; + } +} + +/** + * Menu callback; display form for ordering filters for a format. + */ +function filter_admin_order($format = NULL) { + // Get list (with forced refresh) + $filters = filter_list_format($format->format); + + $form['weights'] = array('#tree' => TRUE); + foreach ($filters as $id => $filter) { + $form['names'][$id] = array('#value' => $filter->name); + $form['weights'][$id] = array('#type' => 'weight', '#default_value' => $filter->weight); + } + $form['format'] = array('#type' => 'hidden', '#value' => $format->format); + $form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + + return drupal_get_form('filter_admin_order', $form); +} + +/** + * Theme filter order configuration form. + */ +function theme_filter_admin_order($form) { + $header = array(t('Name'), t('Weight')); + $rows = array(); + foreach (element_children($form['names']) as $id) { + // Don't take form control structures + if (is_array($form['names'][$id])) { + $rows[] = array(form_render($form['names'][$id]), form_render($form['weights'][$id])); + } + } + + $output = theme('table', $header, $rows); + $output .= form_render($form); + + return $output; +} + +/** + * Process filter order configuration form submission. + */ +function filter_admin_order_submit($form_id, $form_values) { + foreach ($form_values['weights'] as $id => $weight) { + list($module, $delta) = explode('/', $id); + db_query("UPDATE {filters} SET weight = %d WHERE format = %d AND module = '%s' AND delta = %d", $weight, $form_values['format'], $module, $delta); + } + drupal_set_message(t('The filter ordering has been saved.')); + + cache_clear_all('filter:'. $form_values['format'], true); +} + +/** + * Menu callback; display settings defined by filters. + */ +function filter_admin_configure() { + $format = arg(2); + + $list = filter_list_format($format); + $form = array(); + foreach ($list as $filter) { + $form_module = module_invoke($filter->module, 'filter', 'settings', $filter->delta, $format); + if (isset($form_module) && is_array($form_module)) { + $form = array_merge($form, $form_module); + } + } + + if (!empty($form)) { + $output = system_settings_form('filter_admin_configure', $form); + } + else { + $output = t('No settings are available.'); + } + + return $output; +} + +/** + * Retrieve a list of input formats. + */ +function filter_formats() { + global $user; + static $formats; + + // Administrators can always use all input formats. + $all = user_access('administer filters'); + + if (!isset($formats)) { + $formats = array(); + + $query = 'SELECT * FROM {filter_formats}'; + + // Build query for selecting the format(s) based on the user's roles. + if (!$all) { + $where = array(); + foreach ($user->roles as $rid => $role) { + $where[] = "roles LIKE '%%,%d,%%'"; + $args[] = $rid; + } + $query .= ' WHERE '. implode(' OR ', $where) . ' OR format = %d'; + $args[] = variable_get('filter_default_format', 1); + } + + $result = db_query($query, $args); + while ($format = db_fetch_object($result)) { + $formats[$format->format] = $format; + } + } + return $formats; +} + +/** + * Build a list of all filters. + */ +function filter_list_all() { + $filters = array(); + + foreach (module_list() as $module) { + $list = module_invoke($module, 'filter', 'list'); + if (isset($list) && is_array($list)) { + foreach ($list as $delta => $name) { + $filters[$module .'/'. $delta] = (object)array('module' => $module, 'delta' => $delta, 'name' => $name); + } + } + } + + uasort($filters, '_filter_list_cmp'); + + return $filters; +} + +/** + * Helper function for sorting the filter list by filter name. + */ +function _filter_list_cmp($a, $b) { + return strcmp($a->name, $b->name); +} + +/** + * Resolve a format id, including the default format. + */ +function filter_resolve_format($format) { + return $format == FILTER_FORMAT_DEFAULT ? variable_get('filter_default_format', 1) : $format; +} +/** + * Check if text in a certain input format is allowed to be cached. + */ +function filter_format_allowcache($format) { + static $cache = array(); + $format = filter_resolve_format($format); + if (!isset($cache[$format])) { + $cache[$format] = db_result(db_query('SELECT cache FROM {filter_formats} WHERE format = %d', $format)); + } + return $cache[$format]; +} + +/** + * Retrieve a list of filters for a certain format. + */ +function filter_list_format($format) { + static $filters = array(); + + if (!isset($filters[$format])) { + $filters[$format] = array(); + $result = db_query("SELECT * FROM {filters} WHERE format = %d ORDER BY weight ASC", $format); + while ($filter = db_fetch_object($result)) { + $list = module_invoke($filter->module, 'filter', 'list'); + if (isset($list) && is_array($list) && isset($list[$filter->delta])) { + $filter->name = $list[$filter->delta]; + $filters[$format][$filter->module .'/'. $filter->delta] = $filter; + } + } + } + + return $filters[$format]; +} + +/** + * @name Filtering functions + * @{ + * Modules which need to have content filtered can use these functions to + * interact with the filter system. + * + * For more info, see the hook_filter() documentation. + * + * Note: because filters can inject JavaScript or execute PHP code, security is + * vital here. When a user supplies a $format, you should validate it with + * filter_access($format) before accepting/using it. This is normally done in + * the validation stage of the node system. You should for example never make a + * preview of content in a disallowed format. + */ + +/** + * Run all the enabled filters on a piece of text. + * + * @param $text + * The text to be filtered. + * @param $format + * The format of the text to be filtered. Specify FILTER_FORMAT_DEFAULT for + * the default format. + * @param $check + * Whether to check the $format with filter_access() first. Defaults to TRUE. + * Note that this will check the permissions of the current user, so you + * should specify $check = FALSE when viewing other people's content. When + * showing content that is not (yet) stored in the database (eg. upon preview), + * set to TRUE so the user's permissions are checked. + */ +function check_markup($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) { + // When $check = true, do an access check on $format. + if (isset($text) && (!$check || filter_access($format))) { + $format = filter_resolve_format($format); + + // Check for a cached version of this piece of text. + $id = 'filter:'. $format .':'. md5($text); + if ($cached = cache_get($id)) { + return $cached->data; + } + + // See if caching is allowed for this format. + $cache = filter_format_allowcache($format); + + // Convert all Windows and Mac newlines to a single newline, + // so filters only need to deal with one possibility. + $text = str_replace(array("\r\n", "\r"), "\n", $text); + + // Get a complete list of filters, ordered properly. + $filters = filter_list_format($format); + + // Give filters the chance to escape HTML-like data such as code or formulas. + foreach ($filters as $filter) { + $text = module_invoke($filter->module, 'filter', 'prepare', $filter->delta, $format, $text); + } + + // Perform filtering. + foreach ($filters as $filter) { + $text = module_invoke($filter->module, 'filter', 'process', $filter->delta, $format, $text); + } + + // Store in cache with a minimum expiration time of 1 day. + if ($cache) { + cache_set($id, $text, time() + (60 * 60 * 24)); + } + } + else { + $text = message_na(); + } + + return $text; +} + +/** + * Generate a selector for choosing a format in a form. + * + * @param $value + * The ID of the format that is currently selected. + * @param $weight + * The weight of the input format. + * @param $parents + * Required when defining multiple input formats on a single node or having a different parent than 'format'. + * @return + * HTML for the form element. + */ +function filter_form($value = FILTER_FORMAT_DEFAULT, $weight = NULL, $parents = array('format')) { + $value = filter_resolve_format($value); + $formats = filter_formats(); + + $extra = l(t('More information about formatting options'), 'filter/tips'); + + if (count($formats) > 1) { + $form = array( + '#type' => 'fieldset', + '#title' => t('Input format'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + '#weight' => $weight, + '#validate' => array('filter_form_validate' => array()), + ); + // Multiple formats available: display radio buttons with tips. + foreach ($formats as $format) { + $form[$format->format] = array( + '#type' => 'radio', + '#title' => $format->name, + '#default_value' => $value, + '#return_value' => $format->format, + '#parents' => $parents, + '#description' => theme('filter_tips', _filter_tips($format->format, false)), + ); + } + } + else { + // Only one format available: use a hidden form item and only show tips. + $format = array_shift($formats); + $form[$format->format] = array('#type' => 'value', '#value' => $format->format, '#parents' => $parents); + $tips = _filter_tips(variable_get('filter_default_format', 1), false); + $form['format']['guidelines'] = array( + '#title' => t('Formatting guidelines'), + '#value' => theme('filter_tips', $tips, false, $extra), + ); + } + $form[] = array( + '#type' => 'markup', + '#value' => $extra, + ); + return $form; +} + +function filter_form_validate($form) { + foreach (element_children($form) as $key) { + if ($form[$key]['#value'] == $form[$key]['#return_value']) { + return; + } + } + form_error($form, t('An illegal choice has been detected. Please contact the site administrator.')); + watchdog('form', t('Illegal choice %choice in %name element.', array('%choice' => theme('placeholder', check_plain($v)), '%name' => theme('placeholder', empty($form['#title']) ? $form['#parents'][0] : $form['#title']))), WATCHDOG_ERROR); +} + +/** + * Returns true if the user is allowed to access this format. + */ +function filter_access($format) { + $format = filter_resolve_format($format); + if (user_access('administer filters') || ($format == variable_get('filter_default_format', 1))) { + return true; + } + else { + $formats = filter_formats(); + return isset($formats[$format]); + } +} +/** + * @} End of "Filtering functions". + */ + +/** + * Menu callback; show a page with long filter tips. + */ +function filter_tips_long() { + $format = arg(2); + if ($format) { + $output = theme('filter_tips', _filter_tips($format, true), true); + } + else { + $output = theme('filter_tips', _filter_tips(-1, true), true); + } + return $output; +} + +/** + * Helper function for fetching filter tips. + */ +function _filter_tips($format, $long = false) { + if ($format == -1) { + $formats = filter_formats(); + } + else { + $formats = array(db_fetch_object(db_query("SELECT * FROM {filter_formats} WHERE format = %d", $format))); + } + + $tips = array(); + + foreach ($formats as $format) { + $filters = filter_list_format($format->format); + + $tips[$format->name] = array(); + foreach ($filters as $id => $filter) { + if ($tip = module_invoke($filter->module, 'filter_tips', $filter->delta, $format->format, $long)) { + $tips[$format->name][] = array('tip' => $tip, 'id' => $id); + } + } + } + + return $tips; +} + +/** + * Format a set of filter tips. + * + * @ingroup themeable + */ +function theme_filter_tips($tips, $long = false, $extra = '') { + $output = ''; + + $multiple = count($tips) > 1; + if ($multiple) { + $output = t('input formats') .':'; + } + + if (count($tips)) { + if ($multiple) { + $output .= '
                    '; + } + foreach ($tips as $name => $tiplist) { + if ($multiple) { + $output .= '
                  • '; + $output .= ''. $name .':
                    '; + } + + $tips = ''; + foreach ($tiplist as $tip) { + $tips .= '' : '>') . $tip['tip'] . '
                    • '; + } + + if ($tips) { + $output .= "
                      $tips
                    "; + } + + if ($multiple) { + $output .= ''; + } + } + if ($multiple) { + $output .= '
                  '; + } + } + + return $output; +} + +/** + * @name Standard filters + * @{ + * Filters implemented by the filter.module. + */ + +/** + * Implementation of hook_filter(). Contains a basic set of essential filters. + * - HTML filter: + * Validates user-supplied HTML, transforming it as necessary. + * - PHP evaluator: + * Executes PHP code. + * - Line break converter: + * Converts newlines into paragraph and break tags. + */ +function filter_filter($op, $delta = 0, $format = -1, $text = '') { + switch ($op) { + case 'list': + return array(0 => t('HTML filter'), 1 => t('PHP evaluator'), 2 => t('Line break converter')); + + case 'no cache': + return $delta == 1; // No caching for the PHP evaluator. + + case 'description': + switch ($delta) { + case 0: + return t('Allows you to restrict if users can post HTML and which tags to filter out.'); + case 1: + return t('Runs a piece of PHP code. The usage of this filter should be restricted to administrators only!'); + case 2: + return t('Converts line breaks into HTML (i.e. <br> and <p> tags).'); + default: + return; + } + + case 'process': + switch ($delta) { + case 0: + return _filter_html($text, $format); + case 1: + return drupal_eval($text); + case 2: + return _filter_autop($text); + default: + return $text; + } + + case 'settings': + switch ($delta) { + case 0: + return _filter_html_settings($format); + default: + return; + } + + default: + return $text; + } +} + +/** + * Settings for the HTML filter. + */ +function _filter_html_settings($format) { + $form['filter_html'] = array('#type' => 'fieldset', '#title' => t('HTML filter'), '#collapsible' => TRUE, '#collapsed' => TRUE); + $form['filter_html']["filter_html_$format"] = array('#type' => 'radios', '#title' => t('Filter HTML tags'), '#default_value' => variable_get("filter_html_$format", FILTER_HTML_STRIP), '#options' => array(FILTER_HTML_STRIP => t('Strip disallowed tags'), FILTER_HTML_ESCAPE => t('Escape all tags')), '#description' => t('How to deal with HTML tags in user-contributed content. If set to "Strip disallowed tags", dangerous tags are removed (see below). If set to "Escape tags", all HTML is escaped and presented as it was typed.')); + $form['filter_html']["allowed_html_$format"] = array('#type' => 'textfield', '#title' => t('Allowed HTML tags'), '#default_value' => variable_get("allowed_html_$format", '
                    1. '), '#size' => 64, '#maxlength' => 255, '#description' => t('If "Strip disallowed tags" is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped.')); + $form['filter_html']["filter_html_help_$format"] = array('#type' => 'checkbox', '#title' => t('Display HTML help'), '#default_value' => variable_get("filter_html_help_$format", 1), '#description' => t('If enabled, Drupal will display some basic HTML help in the long filter tips.')); + $form['filter_html']["filter_html_nofollow_$format"] = array('#type' => 'checkbox', '#title' => t('Spam link deterrent'), '#default_value' => variable_get("filter_html_nofollow_$format", FALSE), '#description' => t('If enabled, Drupal will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.')); + return $form; +} + +/** + * HTML filter. Provides filtering of input into accepted HTML. + */ +function _filter_html($text, $format) { + if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_STRIP) { + $allowed_tags = preg_split('/\s+|<|>/', variable_get("allowed_html_$format", '
                        1. '), -1, PREG_SPLIT_NO_EMPTY); + $text = filter_xss($text, $allowed_tags); + } + + if (variable_get("filter_html_$format", FILTER_HTML_STRIP) == FILTER_HTML_ESCAPE) { + // Escape HTML + $text = check_plain($text); + } + + if (variable_get("filter_html_nofollow_$format", FALSE)) { + $text = preg_replace('/]+)>/i', '', $text); + } + + return trim($text); +} + +/** + * Convert line breaks into

                          and
                          in an intelligent fashion. + * Based on: http://photomatt.net/scripts/autop + */ +function _filter_autop($text) { + // All block level tags + $block = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|p|h[1-6])'; + + // Split at 

                          , ,  tags.
+  // We don't apply any processing to the contents of these tags to avoid messing
+  // up code. We look for matched pairs and allow basic nesting. For example:
+  // "processed 
                           ignored  ignored 
                           processed"
+  $chunks = preg_split('@(]*>)@i', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+  // Note: PHP ensures the array consists of alternating delimiters and literals
+  // and begins and ends with a literal (inserting NULL as required).
+  $ignore = false;
+  $ignoretag = '';
+  $output = '';
+  foreach ($chunks as $i => $chunk) {
+    if ($i % 2) {
+      // Opening or closing tag?
+      $open = ($chunk[1] != '/');
+      list($tag) = split('[ >]', substr($chunk, 2 - $open), 2);
+      if (!$ignore) {
+        if ($open) {
+          $ignore = true;
+          $ignoretag = $tag;
+        }
+      }
+      // Only allow a matching tag to close it.
+      else if (!$open && $ignoretag == $tag) {
+        $ignore = false;
+        $ignoretag = '';
+      }
+    }
+    else if (!$ignore) {
+      $chunk = preg_replace('|\n*$|', '', $chunk) ."\n\n"; // just to make things a little easier, pad the end
+      $chunk = preg_replace('|
                          \s*
                          |', "\n\n", $chunk);
+      $chunk = preg_replace('!(<'. $block .'[^>]*>)!', "\n$1", $chunk); // Space things out a little
+      $chunk = preg_replace('!()!', "$1\n\n", $chunk); // Space things out a little
+      $chunk = preg_replace("/\n\n+/", "\n\n", $chunk); // take care of duplicates
+      $chunk = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "
                          $1
                          \n", $chunk); // make paragraphs, including one at the end
+      $chunk = preg_replace('|
                          \s*?
                          |', '', $chunk); // under certain strange conditions it could create a P of entirely whitespace
+      $chunk = preg_replace("|
                          (|", "$1", $chunk); // problem with nested lists
+      $chunk = preg_replace('|
                          ]*)>|i', "
                          ", $chunk);
+      $chunk = str_replace('
                          ', '
                          ', $chunk);
+      $chunk = preg_replace('!
                          \s*(]*>)!', "$1", $chunk);
+      $chunk = preg_replace('!(]*>)\s*
                          !', "$1", $chunk);
+      $chunk = preg_replace('|(?)\s*\n|', "
                          \n", $chunk); // make line breaks
+      $chunk = preg_replace('!(]*>)\s*
                          !', "$1", $chunk);
+      $chunk = preg_replace('!
                          (\s*)!', '$1', $chunk);
+      $chunk = preg_replace('/&([^#])(?![A-Za-z0-9]{1,8};)/', '&$1', $chunk);
+    }
+    $output .= $chunk;
+  }
+  return $output;
+}
+
+/**
+ * Very permissive XSS/HTML filter for admin-only use.
+ *
+ * Use only for fields where it is impractical to use the
+ * whole filter system, but where some (mainly inline) mark-up
+ * is desired (so check_plain() is not acceptable).
+ *
+ * Allows all tags that can be used inside an HTML body, save
+ * for scripts and styles.
+ */
+function filter_xss_admin($string) {
+  return filter_xss($string, array('a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big', 'blockquote', 'br', 'caption', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'div', 'dl', 'dt', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'ins', 'kbd', 'li', 'object', 'ol', 'p', 'param', 'pre', 'q', 'samp', 'small', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'ul', 'var'));
+}
+
+/**
+ * Filters XSS. Based on kses by Ulf Harnhammar, see
+ * http://sourceforge.net/projects/kses
+ *
+ * For examples of various XSS attacks, see:
+ * http://ha.ckers.org/xss.html
+ *
+ * This code does four things:
+ * - Removes characters and constructs that can trick browsers
+ * - Makes sure all HTML entities are well-formed
+ * - Makes sure all HTML tags and attributes are well-formed
+ * - Makes sure no HTML tags contain URLs with a disallowed protocol (e.g. javascript:)
+ *
+ * @param $string
+ *   The string with raw HTML in it. It will be stripped of everything that can cause
+ *   an XSS attack.
+ * @param $allowed_tags
+ *   An array of allowed tags.
+ * @param $format
+ *   The format to use.
+ */
+function filter_xss($string, $allowed_tags = array('a', 'em', 'strong', 'cite', 'code', 'ul', 'ol', 'li', 'dl', 'dt', 'dd')) {
+  // Store the input format
+  _filter_xss_split($allowed_tags, TRUE);
+  // Remove NUL characters (ignored by some browsers)
+  $string = str_replace(chr(0), '', $string);
+  // Remove Netscape 4 JS entities
+  $string = preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
+
+  // Defuse all HTML entities
+  $string = str_replace('&', '&', $string);
+  // Change back only well-formed entities in our whitelist
+  // Named entities
+  $string = preg_replace('/&([A-Za-z][A-Za-z0-9]*;)/', '&\1', $string);
+  // Decimal numeric entities
+  $string = preg_replace('/&#([0-9]+;)/', '&#\1', $string);
+  // Hexadecimal numeric entities
+  $string = preg_replace('/&#[Xx]0*((?:[0-9A-Fa-f]{2})+;)/', '&#x\1', $string);
+
+  return preg_replace_callback('%
+    (
+    <[^>]*.(>|$)  # a string that starts with a <, up until the > or the end of the string
+    |             # or
+    >             # just a >
+    )%x', '_filter_xss_split', $string);
+}
+
+/**
+ * Processes an HTML tag.
+ *
+ * @param @m
+ *   An array with various meaning depending on the value of $store.
+ *   If $store is TRUE then the array contains the allowed tags.
+ *   If $store is FALSE then the array has one element, the HTML tag to process.
+ * @param $store
+ *   Whether to store $m.
+ * @return
+ *   If the element isn't allowed, an empty string. Otherwise, the cleaned up
+ *   version of the HTML element.
+ */
+function _filter_xss_split($m, $store = FALSE) {
+  static $allowed_html;
+
+  if ($store) {
+    $allowed_html = array_flip($m);
+    return;
+  }
+
+  $string = $m[1];
+
+  if (substr($string, 0, 1) != '<') {
+    // We matched a lone ">" character
+    return '>';
+  }
+
+  if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+    // Seriously malformed
+    return '';
+  }
+
+  $slash = trim($matches[1]);
+  $elem = &$matches[2];
+  $attrlist = &$matches[3];
+
+  if (!isset($allowed_html[strtolower($elem)])) {
+    // Disallowed HTML element
+    return '';
+  }
+
+  if ($slash != '') {
+    return "";
+  }
+
+  // Is there a closing XHTML slash at the end of the attributes?
+  // In PHP 5.1.0+ we could count the changes, currently we need a separate match
+  $xhtml_slash = preg_match('%\s?/\s*$%', $attrlist) ? ' /' : '';
+  $attrlist = preg_replace('%(\s?)/\s*$%', '\1', $attrlist);
+
+  // Clean up attributes
+  $attr2 = implode(' ', _filter_xss_attributes($attrlist));
+  $attr2 = preg_replace('/[<>]/', '', $attr2);
+  $attr2 = strlen($attr2) ? ' '. $attr2 : '';
+
+  return "<$elem$attr2$xhtml_slash>";
+}
+
+/**
+ * Processes a string of HTML attributes.
+ *
+ * @return
+ *   Cleaned up version of the HTML attributes.
+ */
+function _filter_xss_attributes($attr) {
+  $attrarr = array();
+  $mode = 0;
+  $attrname = '';
+
+  while (strlen($attr) != 0) {
+    // Was the last operation successful?
+    $working = 0;
+
+    switch ($mode) {
+      case 0:
+        // Attribute name, href for instance
+        if (preg_match('/^([-a-zA-Z]+)/', $attr, $match)) {
+          $attrname = strtolower($match[1]);
+          $skip = ($attrname == 'style' || substr($attrname, 0, 2) == 'on');
+          $working = $mode = 1;
+          $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
+        }
+
+        break;
+
+      case 1:
+        // Equals sign or valueless ("selected")
+        if (preg_match('/^\s*=\s*/', $attr)) {
+          $working = 1; $mode = 2;
+          $attr = preg_replace('/^\s*=\s*/', '', $attr);
+          break;
+        }
+
+        if (preg_match('/^\s+/', $attr)) {
+          $working = 1; $mode = 0;
+          if (!$skip) {
+            $attrarr[] = $attrname;
+          }
+          $attr = preg_replace('/^\s+/', '', $attr);
+        }
+
+        break;
+
+      case 2:
+        // Attribute value, a URL after href= for instance
+        if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) {
+          $thisval = filter_xss_bad_protocol($match[1]);
+
+          if (!$skip) {
+            $attrarr[] = "$attrname=\"$thisval\"";
+          }
+          $working = 1;
+          $mode = 0;
+          $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
+          break;
+        }
+
+        if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) {
+          $thisval = filter_xss_bad_protocol($match[1]);
+
+          if (!$skip) {
+            $attrarr[] = "$attrname='$thisval'";;
+          }
+          $working = 1; $mode = 0;
+          $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
+          break;
+        }
+
+        if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) {
+          $thisval = filter_xss_bad_protocol($match[1]);
+
+          if (!$skip) {
+            $attrarr[] = "$attrname=\"$thisval\"";
+          }
+          $working = 1; $mode = 0;
+          $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
+        }
+
+        break;
+    }
+
+    if ($working == 0) {
+      // not well formed, remove and try again
+      $attr = preg_replace('/
+        ^
+        (
+        "[^"]*("|$)     # - a string that starts with a double quote, up until the next double quote or the end of the string
+        |               # or
+        \'[^\']*(\'|$)| # - a string that starts with a quote, up until the next quote or the end of the string
+        |               # or
+        \S              # - a non-whitespace character
+        )*              # any number of the above three
+        \s*             # any number of whitespaces
+        /x', '', $attr);
+      $mode = 0;
+    }
+  }
+
+  // the attribute list ends with a valueless attribute like "selected"
+  if ($mode == 1) {
+    $attrarr[] = $attrname;
+  }
+  return $attrarr;
+}
+
+/**
+ * Processes an HTML attribute value and ensures it does not contain an URL
+ * with a disallowed protocol (e.g. javascript:)
+ *
+ * @param $string
+ *   The string with the attribute value.
+ * @param $decode
+ *   Whether to decode entities in the $string. Set to FALSE if the $string
+ *   is in plain text, TRUE otherwise. Defaults to TRUE.
+ * @return
+ *   Cleaned up and HTML-escaped version of $string.
+ */
+function filter_xss_bad_protocol($string, $decode = TRUE) {
+  static $allowed_protocols;
+  if (!isset($allowed_protocols)) {
+    $allowed_protocols = array_flip(variable_get('filter_allowed_protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal')));
+  }
+
+  // Get the plain text representation of the attribute value (i.e. its meaning)
+  if ($decode) {
+    $string = decode_entities($string);
+  }
+  // Remove soft hyphen
+  $string = str_replace(chr(194) . chr(173), '', $string);
+  // Strip protocols
+
+  do {
+    $before = $string;
+    $colonpos = strpos($string, ':');
+    if ($colonpos > 0) {
+      $protocol = substr($string, 0, $colonpos);
+      if (!isset($allowed_protocols[$protocol])) {
+        $string = substr($string, $colonpos + 1);
+      }
+    }
+  } while ($before != $string);
+  return check_plain($string);
+}
+
+/**
+ * @} End of "Standard filters".
+ */
+
diff --git a/modules/forum.module b/modules/forum.module
new file mode 100644
index 0000000..6d5fe65
--- /dev/null
+++ b/modules/forum.module
@@ -0,0 +1,1126 @@
+'. t('The forum module lets you create threaded discussion forums for a particular topic on your site. This is similar to a message board system such as phpBB. Forums are very useful because they allow community members to discuss topics with one another, and they are archived for future reference.') .'
                          ';
+      $output .= '
                          '. t('Forums can be organized under what are called containers. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them.  Forum topics can be moved by selecting a different forum and can be left in the existing forum by selecting leave a shadow copy.  Forum topics can also have their own URL.') .'
                          ';
+      $output .= '
                          '. t('Forums module requires Taxonomy and Comments module be enabled.') .'
                          ';
+      $output .= t('
                          You can
                          
+                          
+', array('%admin-forum' => url('admin/forum'), '%admin-modules' => url('admin/modules'), '%admin-help-comment' => url('admin/help/comment'), '%admin-help-taxonomy' => url('admin/help/taxonomy')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Forum page.', array('%forum' => 'http://drupal.org/handbook/modules/forum/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Enables threaded discussions about general topics.');
+    case 'admin/forum':
+      return t('
                          This is a list of existing containers and forums that you can edit. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them.
                          ');
+    case 'admin/forum/add/container':
+      return t('
                          Containers help you organize your forums. The job of a container is to hold, or contain, other forums that are related. For example, a container named "Food" might hold two forums named "Fruit" and "Vegetables".
                          ');
+    case 'admin/forum/add/forum':
+      return t('
                          A forum holds discussion topics that are related. For example, a forum named "Fruit" might contain topics titled "Apples" and "Bananas".
                          ');
+    case 'admin/forum/configure':
+      return t('This is where you can configure system-wide options for how your forums act and display.');
+    case 'node/add#forum':
+      return t('Create a new topic for discussion in the forums.');
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function forum_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'node/add/forum',
+      'title' => t('forum topic'),
+      'access' => user_access('create forum topics'));
+    $items[] = array('path' => 'forum',
+      'title' => t('forums'),
+      'callback' => 'forum_page',
+      'access' => user_access('access content'),
+      'type' => MENU_SUGGESTED_ITEM);
+    $items[] = array('path' => 'admin/forum',
+      'title' => t('forums'),
+      'callback' => 'forum_overview',
+      'access' => user_access('administer forums'),
+      'type' => MENU_NORMAL_ITEM);
+    $items[] = array('path' => 'admin/forum/list',
+      'title' => t('list'),
+      'access' => user_access('administer forums'),
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+      'weight' => -10);
+    $items[] = array('path' => 'admin/forum/add/container',
+      'title' => t('add container'),
+      'callback' => 'forum_form_container',
+      'access' => user_access('administer forums'),
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/forum/add/forum',
+      'title' => t('add forum'),
+      'callback' => 'forum_form_forum',
+      'access' => user_access('administer forums'),
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/forum/configure',
+      'title' => t('configure'),
+      'callback' => 'forum_admin_configure',
+      'access' => user_access('administer forums'),
+      'type' => MENU_LOCAL_TASK);
+  }
+  elseif (is_numeric(arg(4))) {
+    $term = taxonomy_get_term(arg(4));
+    // Check if this is a valid term.
+    if ($term) {
+      $items[] = array('path' => 'admin/forum/edit/container',
+        'title' => t('edit container'),
+        'callback' => 'forum_form_container',
+        'callback arguments' => array((array)$term),
+        'access' => user_access('administer forums'),
+        'type' => MENU_CALLBACK);
+      $items[] = array('path' => 'admin/forum/edit/forum',
+        'title' => t('edit forum'),
+        'callback' => 'forum_form_forum',
+        'callback arguments' => array((array)$term),
+        'access' => user_access('administer forums'),
+        'type' => MENU_CALLBACK);
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_node_info().
+ */
+function forum_node_info() {
+  return array('forum' => array('name' => t('forum topic'), 'base' => 'forum'));
+}
+
+/**
+ * Implementation of hook_access().
+ */
+function forum_access($op, $node) {
+  global $user;
+
+  if ($op == 'create') {
+    return user_access('create forum topics');
+  }
+
+  if ($op == 'update' || $op == 'delete') {
+    if (user_access('edit own forum topics') && ($user->uid == $node->uid)) {
+      return TRUE;
+    }
+  }
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function forum_perm() {
+  return array('create forum topics', 'edit own forum topics', 'administer forums');
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ */
+function forum_nodeapi(&$node, $op, $teaser, $page) {
+  switch ($op) {
+    case 'delete revision':
+      db_query('DELETE FROM {forum} WHERE vid = %d', $node->vid);
+      break;
+  }
+}
+
+/**
+ * Implementation of hook_taxonomy().
+ */
+function forum_taxonomy($op, $type, $term = NULL) {
+  if ($op == 'delete' && $term['vid'] == _forum_get_vid()) {
+    switch ($type) {
+      case 'term':
+        $results = db_query('SELECT f.nid FROM {forum} f WHERE f.tid = %d', $term['tid']);
+        while ($node = db_fetch_object($results)) {
+          // node_delete will also remove any association with non-forum vocabularies.
+          node_delete($node->nid);
+        }
+
+        // For containers, remove the tid from the forum_containers variable.
+        $containers = variable_get('forum_containers', array());
+        $key = array_search($term['tid'], $containers);
+        if ($key !== FALSE) {
+          unset($containers[$key]);
+        }
+        variable_set('forum_containers', $containers);
+        break;
+      case 'vocabulary':
+        variable_del('forum_nav_vocabulary');
+    }
+  }
+}
+
+/**
+ * Implementation of hook_settings
+ */
+function forum_admin_configure() {
+
+  $form = array();
+  $number = drupal_map_assoc(array(5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 100, 150, 200, 250, 300, 350, 400, 500));
+  $form['forum_hot_topic'] = array('#type' => 'select',
+    '#title' => t('Hot topic threshold'),
+    '#default_value' => variable_get('forum_hot_topic', 15),
+    '#options' => $number,
+    '#description' => t('The number of posts a topic must have to be considered hot.'),
+  );
+  $number = drupal_map_assoc(array(10, 25, 50, 75, 100));
+  $form['forum_per_page'] = array('#type' => 'select',
+    '#title' => t('Topics per page'),
+    '#default_value' => variable_get('forum_per_page', 25),
+    '#options' => $number,
+    '#description' => t('The default number of topics displayed per page; links to browse older messages are automatically being displayed.'),
+  );
+  $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4=> t('Posts - least active first'));
+  $form['forum_order'] = array('#type' => 'radios',
+    '#title' => t('Default order'),
+    '#default_value' => variable_get('forum_order', '1'),
+    '#options' => $forder,
+    '#description' => t('The default display order for topics.'),
+  );
+
+  return system_settings_form('forum_admin_configure', $form);
+}
+
+/**
+ * Implementation of hook_form_alter().
+ */
+function forum_form_alter($form_id, &$form) {
+  // hide critical options from forum vocabulary
+  if ($form_id == 'taxonomy_form_vocabulary') {
+    if ($form['vid']['#value'] == _forum_get_vid()) {
+      $form['help_forum_vocab'] = array(
+        '#value' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
+        '#weight' => -1,
+      );
+      $form['nodes']['forum'] = array('#type' => 'checkbox', '#value' => 1, '#title' => t('forum topic'), '#attributes' => array('disabled' => '' ), '#description' => t('forum topic is affixed to the forum vocabulary.'));
+      $form['hierarchy'] = array('#type' => 'value', '#value' => 1);
+      unset($form['relations']);
+      unset($form['tags']);
+      unset($form['multiple']);
+      $form['required'] = array('#type' => 'value', '#value' => 1);
+    }
+    else {
+      unset($form['nodes']['forum']);
+    }
+  }
+}
+
+/**
+ * Implementation of hook_load().
+ */
+function forum_load($node) {
+  $forum = db_fetch_object(db_query('SELECT * FROM {forum} WHERE vid = %d', $node->vid));
+
+  return $forum;
+}
+
+/**
+ * Implementation of hook_block().
+ *
+ * Generates a block containing the currently active forum topics and the
+ * most recently added forum topics.
+ */
+function forum_block($op = 'list', $delta = 0, $edit = array()) {
+  switch ($op) {
+    case 'list':
+      $blocks[0]['info'] = t('Active forum topics');
+      $blocks[1]['info'] = t('New forum topics');
+      return $blocks;
+
+    case 'configure':
+      $form['forum_block_num_'. $delta] = array('#type' => 'select', '#title' => t('Number of topics'), '#default_value' => variable_get('forum_block_num_'. $delta, '5'), '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
+      return $form;
+
+    case 'save':
+      variable_set('forum_block_num_'. $delta, $edit['forum_block_num_'. $delta]);
+      break;
+
+    case 'view':
+      if (user_access('access content')) {
+        switch ($delta) {
+          case 0:
+            $title = t('Active forum topics');
+            $sql = db_rewrite_sql("SELECT n.nid, n.title, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 AND n.type = 'forum' ORDER BY l.last_comment_timestamp DESC");
+            $result = db_query_range($sql, 0, variable_get('forum_block_num_0', '5'));
+            if (db_num_rows($result)) {
+              $content = node_title_list($result);
+            }
+            break;
+
+          case 1:
+            $title = t('New forum topics');
+            $sql = db_rewrite_sql("SELECT n.nid, n.title, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.type = 'forum' AND n.status = 1 ORDER BY n.nid DESC");
+            $result = db_query_range($sql, 0, variable_get('forum_block_num_1', '5'));
+            if (db_num_rows($result)) {
+              $content = node_title_list($result);
+            }
+            break;
+        }
+
+        if ($content) {
+          $content .= '
                          '. l(t('more'), 'forum', array('title' => t('Read the latest forum topics.'))) .'
                          ';
+        }
+
+        $block['subject'] = $title;
+        $block['content'] = $content;
+
+        return $block;
+      }
+  }
+}
+
+/**
+ * Implementation of hook_view().
+ */
+function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
+  if ($page) {
+    $vocabulary = taxonomy_get_vocabulary(variable_get('forum_nav_vocabulary', ''));
+    // Breadcrumb navigation
+    $breadcrumb = array();
+    $breadcrumb[] = array('path' => 'forum', 'title' => $vocabulary->name);
+    if ($parents = taxonomy_get_parents_all($node->tid)) {
+      $parents = array_reverse($parents);
+      foreach ($parents as $p) {
+        $breadcrumb[] = array('path' => 'forum/'. $p->tid, 'title' => $p->name);
+      }
+    }
+    $breadcrumb[] = array('path' => 'node/'. $node->nid);
+    menu_set_location($breadcrumb);
+  }
+
+  $node = node_prepare($node, $teaser);
+
+  $node->body .= theme('forum_topic_navigation', $node);
+}
+
+/**
+ * Implementation of hook_submit().
+ *
+ * Check in particular that only a "leaf" term in the associated taxonomy
+ * vocabulary is selected, not a "container" term.
+ */
+function forum_submit(&$node) {
+  // Make sure all fields are set properly:
+  $node->icon = $node->icon ? $node->icon : '';
+
+  if ($node->taxonomy) {
+    // Extract the node's proper topic ID.
+    $vocabulary = variable_get('forum_nav_vocabulary', '');
+    foreach ($node->taxonomy as $term) {
+      if (db_result(db_query('SELECT COUNT(*) FROM {term_data} WHERE tid = %d AND vid = %d', $term, $vocabulary))) {
+        $node->tid = $term;
+      }
+    }
+    if ($node->tid && $node->shadow) {
+      // A shadow copy needs to be created. Retain existing term and add new term.
+      $terms = array_keys(taxonomy_node_get_terms($node->nid));
+      if (!in_array($node->tid, $terms)) {
+        $terms[] = $node->tid;
+      }
+      $node->taxonomy = $terms;
+    }
+  }
+}
+
+/**
+ * Implementation of hook_validate().
+ *
+ * Check in particular that only a "leaf" term in the associated taxonomy
+ * vocabulary is selected, not a "container" term.
+ */
+function forum_validate($node) {
+  if ($node->taxonomy) {
+    // Extract the node's proper topic ID.
+    $vocabulary = variable_get('forum_nav_vocabulary', '');
+    $containers = variable_get('forum_containers', array());
+    foreach ($node->taxonomy as $term) {
+      if (db_result(db_query('SELECT COUNT(*) FROM {term_data} WHERE tid = %d AND vid = %d', $term, $vocabulary))) {
+        if (in_array($term, $containers)) {
+          $term = taxonomy_get_term($term);
+          form_set_error('taxonomy', t('The item %forum is only a container for forums. Please select one of the forums below it.', array('%forum' => theme('placeholder', $term->name))));
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Implementation of hook_update().
+ */
+function forum_update($node) {
+  if ($node->revision) {
+    db_query("INSERT INTO {forum} (nid, vid, tid) VALUES (%d, %d, %d)", $node->nid, $node->vid, $node->tid);
+  }
+  else {
+    db_query('UPDATE {forum} SET tid = %d WHERE vid = %d', $node->tid, $node->vid);
+  }
+}
+
+/**
+ * Implementation of hook_form().
+ */
+function forum_form(&$node) {
+  $form['title'] = array('#type' => 'textfield', '#title' => t('Subject'), '#default_value' => $node->title, '#required' => TRUE, '#weight' => -5);
+
+  if ($node->nid) {
+    $forum_terms = taxonomy_node_get_terms_by_vocabulary(_forum_get_vid(), $node->nid);
+    // if editing, give option to leave shadows
+    $shadow = (count($forum_terms) > 1);
+    $form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.'));
+  }
+
+  $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#default_value' => $node->body, '#rows' => 20, '#required' => TRUE);
+  $form['body_filter']['format'] = filter_form($node->format);
+
+  return $form;
+}
+
+/**
+ * Implementation of hook_prepare; assign forum taxonomy when adding a topic from within a forum.
+ */
+function forum_prepare(&$node) {
+  if (!$node->nid) {
+    // new topic
+    $node->taxonomy[arg(3)]->vid = _forum_get_vid();
+    $node->taxonomy[arg(3)]->tid = arg(3);
+  }
+}
+
+/**
+ * Implementation of hook_insert().
+ */
+function forum_insert($node) {
+  db_query('INSERT INTO {forum} (nid, vid, tid) VALUES (%d, %d, %d)', $node->nid, $node->vid, $node->tid);
+}
+
+/**
+ * Implementation of hook_delete().
+ */
+function forum_delete(&$node) {
+  db_query('DELETE FROM {forum} WHERE nid = %d', $node->nid);
+}
+
+/**
+ * Returns a form for adding a container to the forum vocabulary
+ *
+ * @param $edit Associative array containing a container term to be added or edited.
+ */
+function forum_form_container($edit = array()) {
+  // Handle a delete operation.
+  if ($_POST['op'] == t('Delete') || $_POST['edit']['confirm']) {
+    return _forum_confirm_delete($edit['tid']);
+  }
+
+  $form['name'] = array(
+    '#title' => t('Container name'),
+    '#type' => 'textfield',
+    '#default_value' => $edit['name'],
+    '#maxlength' =>  64,
+    '#description' => t('The container name is used to identify related forums.'),
+    '#required' => TRUE
+  );
+
+  $form['description'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Description'),
+    '#default_value' => $edit['description'],
+    '#description' => t('The container description can give users more information about the forums it contains.')
+  );
+  $form['parent']['#tree'] = TRUE;
+  $form['parent'][0] = _forum_parent_select($edit['tid'], t('Parent'), 'container');
+  $form['weight'] = array('#type' => 'weight',
+    '#title' => t('Weight'),
+    '#default_value' => $edit['weight'],
+    '#description' => t('When listing containers, those with with light (small) weights get listed before containers with heavier (larger) weights. Containers with equal weights are sorted alphabetically.')
+  );
+
+  $form['vid'] = array('#type' => 'hidden',
+    '#value' => _forum_get_vid());
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Submit')
+  );
+  if ($edit['tid']) {
+    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
+    $form['tid'] = array('#type' => 'value', '#value' => $edit['tid']);
+  }
+
+  return drupal_get_form('forum_form_container', $form, 'forum_form');
+}
+
+/**
+ * Returns a form for adding a forum to the forum vocabulary
+ *
+ * @param $edit Associative array containing a forum term to be added or edited.
+ */
+function forum_form_forum($edit = array()) {
+  // Handle a delete operation.
+  if ($_POST['op'] == t('Delete') || $_POST['edit']['confirm']) {
+    return _forum_confirm_delete($edit['tid']);
+  }
+
+  $form['name'] = array('#type' => 'textfield',
+    '#title' => t('Forum name'),
+    '#default_value' => $edit['name'],
+    '#maxlength' =>  64,
+    '#description' => t('The forum name is used to identify related discussions.'),
+    '#required' => TRUE,
+  );
+  $form['description'] = array('#type' => 'textarea',
+    '#title' => t('Description'),
+    '#default_value' => $edit['description'],
+    '#description' => t('The forum description can give users more information about the discussion topics it contains.'),
+  );
+  $form['parent']['#tree'] = TRUE;
+  $form['parent'][0] = _forum_parent_select($edit['tid'], t('Parent'), 'forum');
+  $form['weight'] = array('#type' => 'weight',
+    '#title' => t('Weight'),
+    '#default_value' => $edit['weight'],
+    '#description' => t('When listing forums, those with lighter (smaller) weights get listed before containers with heavier (larger) weights. Forums with equal weights are sorted alphabetically.'),
+  );
+
+  $form['vid'] = array('#type' => 'hidden', '#value' => _forum_get_vid());
+  $form['submit' ] = array('#type' => 'submit', '#value' => t('Submit'));
+  if ($edit['tid']) {
+    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
+    $form['tid'] = array('#type' => 'hidden', '#value' => $edit['tid']);
+  }
+
+  return drupal_get_form('forum_form_forum', $form, 'forum_form');
+}
+
+/**
+ * Process forum form and container form submissions.
+ */
+function forum_form_submit($form_id, $form_values) {
+  if ($form_id == 'forum_form_container') {
+    $container = TRUE;
+    $type = t('forum container');
+  }
+  else {
+    $container = false;
+    $type = t('forum');
+  }
+
+  $status = taxonomy_save_term($form_values);
+  switch ($status) {
+    case SAVED_NEW:
+      if ($container) {
+        $containers = variable_get('forum_containers', array());
+        $containers[] = $form_values['tid'];
+        variable_set('forum_containers', $containers);
+      }
+      drupal_set_message(t('Created new %type %term.', array('%term' => theme('placeholder', $form_values['name']), '%type' => $type)));
+      break;
+    case SAVED_UPDATED:
+      drupal_set_message(t('The %type %term has been updated.', array('%term' => theme('placeholder', $form_values['name']), '%type' => $type)));
+      break;
+  }
+  return 'admin/forum';
+}
+
+/**
+ * Returns a confirmation page for deleting a forum taxonomy term.
+ *
+ * @param $tid ID of the term to be deleted
+ */
+function _forum_confirm_delete($tid) {
+  $term = taxonomy_get_term($tid);
+
+  $form['tid'] = array('#type' => 'value', '#value' => $tid);
+  $form['name'] = array('#type' => 'value', '#value' => $term->name);
+
+  return confirm_form('forum_confirm_delete', $form, t('Are you sure you want to delete the forum %name?', array('%name' => theme('placeholder', $term->name))), 'admin/forums', t('Deleting a forum or container will delete all sub-forums and associated posts as well. This action cannot be undone.'), t('Delete'), t('Cancel'));
+}
+
+/**
+ * Implementation of forms api _submit call. Deletes a forum after confirmation.
+ */
+function forum_confirm_delete_submit($form_id, $form_values) {
+  taxonomy_del_term($form_values['tid']);
+  drupal_set_message(t('The forum %term and all sub-forums and associated posts have been deleted.', array('%term' => theme('placeholder', $form_values['name']))));
+  watchdog('content', t('forum: deleted %term and all its sub-forums and associated posts.', array('%term' => theme('placeholder', $form_values['name']))));
+
+  return 'admin/forum';
+}
+
+/**
+ * Returns an overview list of existing forums and containers
+ */
+function forum_overview() {
+  $header = array(t('Name'), t('Operations'));
+
+  $tree = taxonomy_get_tree(_forum_get_vid());
+  if ($tree) {
+    foreach ($tree as $term) {
+      if (in_array($term->tid, variable_get('forum_containers', array()))) {
+        $rows[] = array(_taxonomy_depth($term->depth) .' '. check_plain($term->name), l(t('edit container'), "admin/forum/edit/container/$term->tid"));
+      }
+      else {
+        $rows[] = array(_taxonomy_depth($term->depth) .' '. check_plain($term->name), l(t('edit forum'), "admin/forum/edit/forum/$term->tid"));
+       }
+
+    }
+  }
+  else {
+    $rows[] = array(array('data' => '' . t('There are no existing containers or forums. You may add some on the add container or add forum pages.', array('%container' => url('admin/forum/add/container'), '%forum' => url('admin/forum/add/forum'))) . '', 'colspan' => 2));
+  }
+  return theme('table', $header, $rows);
+}
+
+/**
+ * Returns a select box for available parent terms
+ *
+ * @param $tid ID of the term which is being added or edited
+ * @param $title Title to display the select box with
+ * @param $child_type Whether the child is forum or container
+ */
+function _forum_parent_select($tid, $title, $child_type) {
+
+  $parents = taxonomy_get_parents($tid);
+  if ($parents) {
+    $parent = array_shift($parents);
+    $parent = $parent->tid;
+  }
+  else {
+    $parent = 0;
+  }
+
+  $children = taxonomy_get_tree(_forum_get_vid(), $tid);
+
+  // A term can't be the child of itself, nor of its children.
+  foreach ($children as $child) {
+    $exclude[] = $child->tid;
+  }
+  $exclude[] = $tid;
+
+  $tree = taxonomy_get_tree(_forum_get_vid());
+  $options[0] = '<'. t('root') .'>';
+  if ($tree) {
+    foreach ($tree as $term) {
+      if (!in_array($term->tid, $exclude)) {
+        $options[$term->tid] = _taxonomy_depth($term->depth) . $term->name;
+      }
+    }
+  }
+  if ($child_type == 'container') {
+    $description = t('Containers are usually placed at the top (root) level of your forum but you can also place a container inside a parent container or forum.');
+  }
+  else if ($child_type == 'forum') {
+    $description = t('You may place your forum inside a parent container or forum, or at the top (root) level of your forum.');
+  }
+
+  return array('#type' => 'select', '#title' => $title, '#default_value' => $parent, '#options' => $options, '#description' => $description, '#required' => TRUE);
+}
+
+function forum_term_path($term) {
+  return 'forum/'. $term->tid;
+}
+
+/**
+ * Returns the vocabulary id for forum navigation.
+ */
+function _forum_get_vid() {
+  $vid = variable_get('forum_nav_vocabulary', '');
+  if (empty($vid)) {
+    // Check to see if a forum vocabulary exists
+    $vid = db_result(db_query("SELECT vid FROM {vocabulary} WHERE module = '%s'", 'forum'));
+    if (!$vid) {
+      $edit = array('name' => 'Forums', 'multiple' => 0, 'required' => 1, 'hierarchy' => 1, 'relations' => 0, 'module' => 'forum', 'nodes' => array('forum' => 1));
+      taxonomy_save_vocabulary($edit);
+      $vid = $edit['vid'];
+    }
+    variable_set('forum_nav_vocabulary', $vid);
+  }
+
+  return $vid;
+}
+
+/**
+ * Formats a topic for display
+ *
+ * @TODO Give a better description. Not sure where this function is used yet.
+ */
+function _forum_format($topic) {
+  if ($topic && $topic->timestamp) {
+    return t('%time ago
                          by %author', array('%time' => format_interval(time() - $topic->timestamp), '%author' => theme('username', $topic)));
+  }
+  else {
+    return message_na();
+  }
+}
+
+/**
+ * Returns a list of all forums for a given taxonomy id
+ *
+ * Forum objects contain the following fields
+ * -num_topics Number of topics in the forum
+ * -num_posts Total number of posts in all topics
+ * -last_post Most recent post for the forum
+ *
+ * @param $tid
+ *   Taxonomy ID of the vocabulary that holds the forum list.
+ * @return
+ *   Array of object containing the forum information.
+ */
+function forum_get_forums($tid = 0) {
+
+  $forums = array();
+  $_forums = taxonomy_get_tree(variable_get('forum_nav_vocabulary', ''), $tid);
+
+  if (count($_forums)) {
+
+    $counts = array();
+
+    $sql = "SELECT r.tid, COUNT(n.nid) AS topic_count, SUM(l.comment_count) AS comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.nid = r.nid WHERE n.status = 1 AND n.type = 'forum' GROUP BY r.tid";
+    $sql = db_rewrite_sql($sql);
+    $_counts = db_query($sql, $forum->tid);
+    while ($count = db_fetch_object($_counts)) {
+      $counts[$count->tid] = $count;
+    }
+  }
+
+  foreach ($_forums as $forum) {
+    if (in_array($forum->tid, variable_get('forum_containers', array()))) {
+      $forum->container = 1;
+    }
+
+    if ($counts[$forum->tid]) {
+      $forum->num_topics = $counts[$forum->tid]->topic_count;
+      $forum->num_posts = $counts[$forum->tid]->topic_count + $counts[$forum->tid]->comment_count;
+    }
+    else {
+      $forum->num_topics = 0;
+      $forum->num_posts = 0;
+    }
+
+    // This query does not use full ANSI syntax since MySQL 3.x does not support
+    // table1 INNER JOIN table2 INNER JOIN table3 ON table2_criteria ON table3_criteria
+    // used to join node_comment_statistics to users.
+    $sql = "SELECT ncs.last_comment_timestamp, IF (ncs.last_comment_uid != 0, u2.name, ncs.last_comment_name) AS last_comment_name, ncs.last_comment_uid FROM {node} n INNER JOIN {users} u1 ON n.uid = u1.uid INNER JOIN {term_node} tn ON n.nid = tn.nid INNER JOIN {node_comment_statistics} ncs ON n.nid = ncs.nid INNER JOIN {users} u2 ON ncs.last_comment_uid=u2.uid WHERE n.status = 1 AND tn.tid = %d ORDER BY ncs.last_comment_timestamp DESC";
+    $sql = db_rewrite_sql($sql);
+    $topic = db_fetch_object(db_query_range($sql, $forum->tid, 0, 1));
+
+    $last_post = new StdClass();
+    $last_post->timestamp = $topic->last_comment_timestamp;
+    $last_post->name = $topic->last_comment_name;
+    $last_post->uid = $topic->last_comment_uid;
+    $forum->last_post = $last_post;
+
+    $forums[$forum->tid] = $forum;
+  }
+
+  return $forums;
+}
+
+/**
+ * Calculate the number of nodes the user has not yet read and are newer
+ * than NODE_NEW_LIMIT.
+ */
+function _forum_topics_unread($term, $uid) {
+  $sql = "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.type = 'forum' AND n.created > %d AND h.nid IS NULL";
+  $sql = db_rewrite_sql($sql);
+  return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT));
+}
+
+function forum_get_topics($tid, $sortby, $forum_per_page) {
+  global $user, $forum_topic_list_header;
+
+  $forum_topic_list_header = array(
+    array('data' => ' '),
+    array('data' => t('Topic'), 'field' => 'n.title'),
+    array('data' => t('Replies'), 'field' => 'l.comment_count'),
+    array('data' => t('Created'), 'field' => 'n.created'),
+    array('data' => t('Last reply'), 'field' => 'l.last_comment_timestamp'),
+  );
+
+  $order = _forum_get_topic_order($sortby);
+  for ($i = 0; $i < count($forum_topic_list_header); $i++) {
+    if ($forum_topic_list_header[$i]['field'] == $order['field']) {
+      $forum_topic_list_header[$i]['sort'] = $order['sort'];
+    }
+  }
+
+  $term = taxonomy_get_term($tid);
+
+  $sql = db_rewrite_sql("SELECT n.nid, f.tid, n.title, n.sticky, u.name, u.uid, n.created AS timestamp, n.comment AS comment_mode, l.last_comment_timestamp, IF(l.last_comment_uid != 0, cu.name, l.last_comment_name) AS last_comment_name, l.last_comment_uid, l.comment_count AS num_comments FROM {node_comment_statistics} l, {users} cu, {term_node} r, {users} u, {forum} f, {node} n WHERE n.status = 1 AND l.last_comment_uid = cu.uid AND n.nid = l.nid AND n.nid = r.nid AND r.tid = %d AND n.uid = u.uid AND n.vid = f.vid");
+  $sql .= tablesort_sql($forum_topic_list_header, 'n.sticky DESC,');
+  $sql .= ', n.created DESC';  // Always add a secondary sort order so that the news forum topics are on top.
+
+  $sql_count = db_rewrite_sql("SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum'");
+
+  $result = pager_query($sql, $forum_per_page, 0, $sql_count, $tid);
+
+  while ($topic = db_fetch_object($result)) {
+    if ($user->uid) {
+      // folder is new if topic is new or there are new comments since last visit
+      if ($topic->tid != $tid) {
+        $topic->new = 0;
+      }
+      else {
+        $history = _forum_user_last_visit($topic->nid);
+        $topic->new_replies = comment_num_new($topic->nid, $history);
+        $topic->new = $topic->new_replies || ($topic->timestamp > $history);
+      }
+    }
+    else {
+      // Do not track "new replies" status for topics if the user is anonymous.
+      $topic->new_replies = 0;
+      $topic->new = 0;
+    }
+
+    if ($topic->num_comments > 0) {
+      $last_reply = new StdClass();
+      $last_reply->timestamp = $topic->last_comment_timestamp;
+      $last_reply->name = $topic->last_comment_name;
+      $last_reply->uid = $topic->last_comment_uid;
+      $topic->last_reply = $last_reply;
+    }
+    $topics[] = $topic;
+  }
+
+  return $topics;
+}
+
+/**
+ * Finds the first unread node for a given forum.
+ */
+function _forum_new($tid) {
+  global $user;
+
+  $sql = "SELECT n.nid FROM {node} n LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum' AND h.nid IS NULL AND n.created > %d ORDER BY created";
+  $sql = db_rewrite_sql($sql);
+  $nid = db_result(db_query_range($sql, $user->uid, $tid, NODE_NEW_LIMIT, 0, 1));
+
+  return $nid ? $nid : 0;
+}
+
+/**
+ * Menu callback; prints a forum listing.
+ */
+function forum_page($tid = 0) {
+  if (module_exist('taxonomy') && module_exist('comment')) {
+    $forum_per_page = variable_get('forum_per_page', 25);
+    $sortby = variable_get('forum_order', 1);
+
+    $forums = forum_get_forums($tid);
+    $parents = taxonomy_get_parents_all($tid);
+    if ($tid && !in_array($tid, variable_get('forum_containers', array()))) {
+      $topics = forum_get_topics($tid, $sortby, $forum_per_page);
+    }
+
+    return theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
+  }
+  else {
+    drupal_set_message(t('The forum module requires both the taxonomy module and the comment module to be enabled and configured.'), 'error');
+    return ' ';
+  }
+}
+
+/**
+ * Format the forum body.
+ *
+ * @ingroup themeable
+ */
+function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_per_page) {
+  global $user;
+  // forum list, topics list, topic browser and 'add new topic' link
+
+  $vocabulary = taxonomy_get_vocabulary(variable_get('forum_nav_vocabulary', ''));
+  $title = $vocabulary->name;
+
+  // Breadcrumb navigation:
+  $breadcrumb = array();
+  if ($tid) {
+    $breadcrumb[] = array('path' => 'forum', 'title' => $title);
+  }
+
+  if ($parents) {
+    $parents = array_reverse($parents);
+    foreach ($parents as $p) {
+      if ($p->tid == $tid) {
+        $title = $p->name;
+      }
+      else {
+        $breadcrumb[] = array('path' => 'forum/'. $p->tid, 'title' => $p->name);
+      }
+    }
+  }
+
+  drupal_set_title($title);
+
+  $breadcrumb[] = array('path' => $_GET['q']);
+  menu_set_location($breadcrumb);
+
+  if (count($forums) || count($parents)) {
+    $output  = '
                          ';
+    $output .= '
                            ';
+
+    if (module_exist('tracker')) {
+      if ($user->uid) {
+        $output .= ' 
                          • '. l(t('My discussions.'), "tracker/$user->uid") .'
                            • ';
+      }
+
+      $output .= ' 
                          • '. l(t('Active discussions.'), 'tracker') .'
                            • ';
+    }
+
+    if (user_access('create forum topics')) {
+      $output .= '
                          • '. l(t('Post new forum topic.'), "node/add/forum/$tid") .'
                            • ';
+    }
+    else if ($user->uid) {
+      $output .= '
                          • '. t('You are not allowed to post a new forum topic.') .'
                            • ';
+    }
+    else {
+      $output .= '
                          • '. t('Login to post a new forum topic.', array('%login' => url('user/login'))) .'
                            • ';
+    }
+    $output .= '
                          ';
+
+    $output .= theme('forum_list', $forums, $parents, $tid);
+
+    if ($tid && !in_array($tid, variable_get('forum_containers', array()))) {
+      drupal_add_link(array('rel' => 'alternate',
+                            'type' => 'application/rss+xml',
+                            'title' => 'RSS - '. $title,
+                            'href' => url('taxonomy/term/'. $tid .'/0/feed')));
+
+      $output .= theme('forum_topic_list', $tid, $topics, $sortby, $forum_per_page);
+      $output .= theme('feed_icon', url("taxonomy/term/$tid/0/feed"));
+    }
+    $output .= '
                          ';
+  }
+  else {
+    drupal_set_title(t('No forums defined'));
+    $output = '';
+  }
+
+  return $output;
+}
+
+/**
+ * Format the forum listing.
+ *
+ * @ingroup themeable
+ */
+function theme_forum_list($forums, $parents, $tid) {
+  global $user;
+
+  if ($forums) {
+
+    $header = array(t('Forum'), t('Topics'), t('Posts'), t('Last post'));
+
+    foreach ($forums as $forum) {
+      if ($forum->container) {
+        $description  = '
                          \n";
+        $description .= ' 
                          '. l($forum->name, "forum/$forum->tid") ."
                          \n";
+
+        if ($forum->description) {
+          $description .= ' 
                          '. filter_xss_admin($forum->description) ."
                          \n";
+        }
+        $description .= "
                          \n";
+
+        $rows[] = array(array('data' => $description, 'class' => 'container', 'colspan' => '4'));
+      }
+      else {
+        $new_topics = _forum_topics_unread($forum->tid, $user->uid);
+        $forum->old_topics = $forum->num_topics - $new_topics;
+        if (!$user->uid) {
+          $new_topics = 0;
+        }
+
+        $description  = '
                          \n";
+        $description .= ' 
                          '. l($forum->name, "forum/$forum->tid") ."
                          \n";
+
+        if ($forum->description) {
+          $description .= ' 
                          '. filter_xss_admin($forum->description) ."
                          \n";
+        }
+        $description .= "
                          \n";
+
+        $rows[] = array(
+          array('data' => $description, 'class' => 'forum'),
+          array('data' => $forum->num_topics . ($new_topics ? '
                          '. l(format_plural($new_topics, '1 new', '%count new'), "forum/$forum->tid", NULL, NULL, 'new') : ''), 'class' => 'topics'),
+          array('data' => $forum->num_posts, 'class' => 'posts'),
+          array('data' => _forum_format($forum->last_post), 'class' => 'last-reply'));
+      }
+    }
+
+    return theme('table', $header, $rows);
+
+  }
+
+}
+
+/**
+ * Format the topic listing.
+ *
+ * @ingroup themeable
+ */
+function theme_forum_topic_list($tid, $topics, $sortby, $forum_per_page) {
+  global $forum_topic_list_header;
+
+  if ($topics) {
+
+    foreach ($topics as $topic) {
+      // folder is new if topic is new or there are new comments since last visit
+      if ($topic->tid != $tid) {
+        $rows[] = array(
+          array('data' => theme('forum_icon', $topic->new, $topic->num_comments, $topic->comment_mode, $topic->sticky), 'class' => 'icon'),
+          array('data' => check_plain($topic->title), 'class' => 'title'),
+          array('data' => l(t('This topic has been moved'), "forum/$topic->tid"), 'colspan' => '3')
+        );
+      }
+      else {
+        $rows[] = array(
+          array('data' => theme('forum_icon', $topic->new, $topic->num_comments, $topic->comment_mode, $topic->sticky), 'class' => 'icon'),
+          array('data' => l($topic->title, "node/$topic->nid"), 'class' => 'topic'),
+          array('data' => $topic->num_comments . ($topic->new_replies ? '
                          '. l(format_plural($topic->new_replies, '1 new', '%count new'), "node/$topic->nid", NULL, NULL, 'new') : ''), 'class' => 'replies'),
+          array('data' => _forum_format($topic), 'class' => 'created'),
+          array('data' => _forum_format($topic->last_reply), 'class' => 'last-reply')
+        );
+      }
+    }
+  }
+
+  $output .= theme('table', $forum_topic_list_header, $rows);
+  $output .= theme('pager', NULL, $forum_per_page, 0);
+
+  return $output;
+}
+
+/**
+ * Format the icon for each individual topic.
+ *
+ * @ingroup themeable
+ */
+function theme_forum_icon($new_posts, $num_posts = 0, $comment_mode = 0, $sticky = 0) {
+
+  if ($num_posts > variable_get('forum_hot_topic', 15)) {
+    $icon = $new_posts ? 'hot-new' : 'hot';
+  }
+  else {
+    $icon = $new_posts ? 'new' : 'default';
+  }
+
+  if ($comment_mode == COMMENT_NODE_READ_ONLY || $comment_mode == COMMENT_NODE_DISABLED) {
+    $icon = 'closed';
+  }
+
+  if ($sticky == 1) {
+    $icon = 'sticky';
+  }
+
+  $output = theme('image', "misc/forum-$icon.png");
+
+  if ($new_posts) {
+    $output = "$output";
+  }
+
+  return $output;
+}
+
+/**
+ * Format the next/previous forum topic navigation links.
+ *
+ * @ingroup themeable
+ */
+function theme_forum_topic_navigation($node) {
+  $output = '';
+
+  // get previous and next topic
+  $sql = "SELECT n.nid, n.title, n.sticky, l.comment_count, l.last_comment_timestamp FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.nid = r.nid AND r.tid = %d WHERE n.status = 1 AND n.type = 'forum' ORDER BY n.sticky DESC, ". _forum_get_topic_order_sql(variable_get('forum_order', 1));
+  $result = db_query(db_rewrite_sql($sql), $node->tid);
+
+  while ($topic = db_fetch_object($result)) {
+    if ($stop == 1) {
+      $next = new StdClass();
+      $next->nid = $topic->nid;
+      $next->title = $topic->title;
+      break;
+    }
+    if ($topic->nid == $node->nid) {
+      $stop = 1;
+    }
+    else {
+      $prev = new StdClass();
+      $prev->nid = $topic->nid;
+      $prev->title = $topic->title;
+    }
+  }
+
+  if ($prev || $next) {
+    $output .= '
                          ';
+
+    if ($prev) {
+      $output .= l(t('‹ ') . $prev->title, 'node/'. $prev->nid, array('class' => 'topic-previous', 'title' => t('Go to previous forum topic')));
+    }
+    if ($prev && $next) {
+      // Word break (a is an inline element)
+      $output .= ' ';
+    }
+    if ($next) {
+      $output .= l($next->title . t(' ›'), 'node/'. $next->nid, array('class' => 'topic-next', 'title' => t('Go to next forum topic')));
+    }
+
+    $output .= '
                          ';
+  }
+
+  return $output;
+}
+
+function _forum_user_last_visit($nid) {
+  global $user;
+  static $history = array();
+
+  if (empty($history)) {
+    $result = db_query('SELECT nid, timestamp FROM {history} WHERE uid = %d', $user->uid);
+    while ($t = db_fetch_object($result)) {
+      $history[$t->nid] = $t->timestamp > NODE_NEW_LIMIT ? $t->timestamp : NODE_NEW_LIMIT;
+    }
+  }
+  return $history[$nid] ? $history[$nid] : NODE_NEW_LIMIT;
+}
+
+function _forum_get_topic_order($sortby) {
+  switch ($sortby) {
+    case 1:
+      return array('field' => 'l.last_comment_timestamp', 'sort' => 'desc');
+      break;
+    case 2:
+      return array('field' => 'l.last_comment_timestamp', 'sort' => 'asc');
+      break;
+    case 3:
+      return array('field' => 'l.comment_count', 'sort' => 'desc');
+      break;
+    case 4:
+      return array('field' => 'l.comment_count', 'sort' => 'asc');
+      break;
+  }
+}
+
+function _forum_get_topic_order_sql($sortby) {
+  $order = _forum_get_topic_order($sortby);
+  return $order['field'] .' '. $order['sort'];
+}
+
+
diff --git a/modules/help.module b/modules/help.module
new file mode 100644
index 0000000..5a8f789
--- /dev/null
+++ b/modules/help.module
@@ -0,0 +1,135 @@
+ 'admin/help', 'title' => t('help'),
+      'callback' => 'help_main',
+      'access' => $admin_access,
+      'weight' => 9);
+
+    foreach (module_implements('help', TRUE) as $module) {
+      $items[] = array('path' => 'admin/help/' . $module,
+        'title' => t($module),
+        'callback' => 'help_page',
+        'type' => MENU_CALLBACK,
+        'access' => $admin_access);
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Menu callback; prints a page listing a glossary of Drupal terminology.
+ */
+function help_main() {
+  $output = t("
+  
                          Help topics
                          
+  
                          Help is available on the following items:
                          
+  %help_pages
+  
                          Glossary of Drupal terminology
                          
+  
                          
+   
                          Block
                          A small box containing information or content placed in the left-hand or right-hand sidebar of a web page.
                          
+   
                          Comment
                          A note attached to a node. Usually intended to clarify, explain, criticize, or express an opinion on the original material.
                          
+   
                          Moderation
                          
+   
                          The activity of making sure a post to a Drupal site fits in with what is expected for that Drupal site.
+    
                          
+     
                          Approved
                          A moderated post which has been accepted by the moderators for publication. (See published).
                          
+     
                          Waiting
                          A moderated post which is still being voted on to be accepted for publication. (See published.)
                          
+    
                          
+   
                          
+   
                          Node
                          The basic data unit in Drupal. Everything is a node or an extension of a node.
                          
+   
                          Public
                          See published.
                          
+   
                          Published
                          A node that is viewable by everyone. (See unpublished.)
                          
+   
                          Role
                          A classification users are placed into for the purpose of setting users' permissions.
                          
+   
                          Taxonomy
                          A division of a collection of things into ordered, classified groups. (See taxonomy help.)
                          
+   
                          Unpublished
                          A node that is only viewable by administrators and moderators.
                          
+   
                          User
                          A person who has an account at your Drupal site, and is logged in with that account.
                          
+   
                          Visitor
                          A person who does not have an account at your Drupal site or a person who has an account at your Drupal site but is not logged in with that account. Also termed \"anonymous user\".
                          
+  
                          ", array('%help_pages' => help_links_as_list(), '%taxonomy' => url('admin/help/taxonomy')));
+
+  return $output;
+}
+
+function help_links_as_list() {
+  $modules = array();
+  foreach (module_implements('help', TRUE) as $module) {
+    if (module_invoke($module, 'help', "admin/help#$module")) {
+      $modules[] = $module;
+    }
+  }
+  sort($modules);
+
+  // Output pretty four-column list
+  $break = ceil(count($modules) / 4);
+  $output = '
                            ';
+  foreach ($modules as $i => $module) {
+    $output .= '
                          • '. l(t($module), 'admin/help/'. $module) .'
                            • ';
+    if (($i + 1) % $break == 0) {
+      $output .= '
                            ';
+    }
+  }
+  $output .= '

                          ';
+
+  return $output;
+}
+
+/**
+ * Implementation of hook_help().
+ */
+function help_help($section) {
+  switch ($section) {
+    case 'admin/help':
+      $output = t('
                          This guide explains what the various modules in Drupal do and how to configure them.
                          
+
                          It is not a substitute for the Drupal handbook available online and should be used in conjunction with it. The online reference handbook might be more up-to-date and has helpful user-contributed comments. It is your definitive reference point for all Drupal documentation.
                          
+', array('%Drupal' => 'http://drupal.org', '%handbook' => 'http://drupal.org/handbook'));
+      return $output;
+    case 'admin/help#help':
+      $output = '
                          '. t('The help module displays context sensitive help information. Users can learn how to use modules and accomplish tasks quicker with less errors by clicking on links in provided by the help module.') .'
                          ';
+      $output .= t('
                          Modules can make documentation available to other modules with this module. All user help should be presented using this module.  Some examples of help: 
                          
+
                            
+
                          • The name of a module (unused, but there).
                            • 
+
                          • The description found on the admin/system/modules page.
                            • 
+
                          • The module\'s help text, displayed on the admin/help page and through the module\'s individual help link.
                            • 
+
                          • The help for a distributed authorization module (if applicable).
                            • 
+
                          • The description of a post type (if applicable).
                            • 
+
                          
+');
+      $output .= '
                          '. t('You can not administer the help system.') .'
                          ';
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Help page.', array('%help' => 'http://drupal.org/handbook/modules/help/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Manages the display of online help.');
+  }
+}
+
+/**
+ * Menu callback; prints a page listing general help for all modules.
+ */
+function help_page() {
+  $name = arg(2);
+  $output = '';
+  if (module_hook($name, 'help')) {
+    $temp = module_invoke($name, 'help', "admin/help#$name");
+    if (empty($temp)) {
+      $output .= t("No help is available for module %module.", array('%module' => $name));
+    }
+    else {
+      $output .= $temp;
+    }
+  }
+  return $output;
+}
diff --git a/modules/legacy.module b/modules/legacy.module
new file mode 100644
index 0000000..91a51db
--- /dev/null
+++ b/modules/legacy.module
@@ -0,0 +1,202 @@
+'. t('The legacy module provides legacy handlers for upgrades from older installations.  These handlers help automatically redirect references to pages from old installations and prevent page not found errors for your site.') .'
                          ';
+      $output .= '
                          '. t('The legacy module handles legacy style taxonomy page, taxonomy feed, and blog feed paths.  It also handles URL upgrades from Drupal 4.1.   It rewrites old-style URLs to new-style URLs (clean URLs). ') .'
                          ';
+      $output .= t('
                          Example Mappings:
                          
+
                            
+
                          • taxonomy/page/or/52,97 to taxonomy/term/52+97.
                            • 
+
                          • taxonomy/feed/or/52,97 to taxonomy/term/52+97/0/feed.
                            • 
+
                          • blog/feed/52 to blog/52/feed.
                            • 
+
                          • node/view/52 to node/52.
                            • 
+
                          • book/view/52 to node/52.
                            • 
+
                          • user/view/52 to user/52.
                            • 
+
                          
+');
+      $output .= '
                          '. t('Legacy module has no configurable options.') .'
                          ';
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Legacy page.', array('%legacy' => 'http://drupal.org/handbook/modules/legacy/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Provides legacy handlers for upgrades from older Drupal installations.');
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ *
+ * Registers menu paths used in earlier Drupal versions.
+ */
+function legacy_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    // Map "taxonomy/page/or/52,97" to "taxonomy/term/52+97".
+    $items[] = array('path' => 'taxonomy/page', 'title' => t('taxonomy'),
+      'callback' => 'legacy_taxonomy_page',
+      'access' => TRUE, 'type' => MENU_CALLBACK);
+
+    // Map "taxonomy/feed/or/52,97" to "taxonomy/term/52+97/0/feed".
+    $items[] = array('path' => 'taxonomy/feed', 'title' => t('taxonomy'),
+      'callback' => 'legacy_taxonomy_feed',
+      'access' => TRUE, 'type' => MENU_CALLBACK);
+
+    // Map "blog/feed/52" to "blog/52/feed".
+    $items[] = array('path' => 'blog/feed', 'title' => t('blog'),
+      'callback' => 'legacy_blog_feed',
+      'access' => TRUE, 'type' => MENU_CALLBACK);
+  }
+  else {
+    // Map "node/view/52" to "node/52".
+    $items[] = array('path' => 'node/view', 'title' => t('view'),
+      'callback' => 'drupal_goto',
+      'callback arguments' => array('node/'. arg(2), NULL, NULL),
+      'access' => TRUE, 'type' => MENU_CALLBACK);
+
+    // Map "book/view/52" to "node/52".
+    $items[] = array('path' => 'book/view', 'title' => t('view'),
+      'callback' => 'drupal_goto',
+      'callback arguments' => array('node/'. arg(2), NULL, NULL),
+      'access' => TRUE, 'type' => MENU_CALLBACK);
+
+    // Map "user/view/52" to "user/52".
+    $items[] = array('path' => 'user/view', 'title' => t('view'),
+      'callback' => 'drupal_goto',
+      'callback arguments' => array('user/'. arg(2), NULL, NULL),
+      'access' => TRUE, 'type' => MENU_CALLBACK);
+  }
+
+  return $items;
+}
+
+/**
+ * Menu callback; redirects users to new taxonomy page paths.
+ */
+function legacy_taxonomy_page($operation = 'or', $str_tids = '') {
+  if ($operation == 'or') {
+    $str_tids = str_replace(',', '+', $str_tids);
+  }
+  drupal_goto('taxonomy/term/'. $str_tids);
+}
+
+/**
+ * Menu callback; redirects users to new taxonomy feed paths.
+ */
+function legacy_taxonomy_feed($operation = 'or', $str_tids = '') {
+  if ($operation == 'or') {
+    $str_tids = str_replace(',', '+', $str_tids);
+  }
+  drupal_goto('taxonomy/term/'. $str_tids .'/0/feed');
+}
+
+/**
+ * Menu callback; redirects users to new blog feed paths.
+ */
+function legacy_blog_feed($str_uid = '') {
+  // if URL is of form blog/feed/52 redirect
+  // if URL is of form blog/feed we have to call blog_feed_last().
+  if (is_numeric($str_uid)) {
+    drupal_goto('blog/'. $str_uid .'/feed');
+  }
+  else {
+    module_invoke('blog', 'feed_last');
+  }
+}
+
+/**
+ * Implementation of hook_filter(). Handles URL upgrades from Drupal 4.1.
+ */
+function legacy_filter($op, $delta = 0, $format = -1, $text = '') {
+  switch ($op) {
+    case 'list':
+      return array(t('Legacy filter'));
+
+    case 'description':
+      return t('Replaces URLs from Drupal 4.1 (and lower) with updated equivalents.');
+
+    case 'process':
+      return _legacy_filter_old_urls($text);
+
+    case 'settings':
+      return;
+
+    default:
+      return $text;
+  }
+}
+
+/**
+ * Rewrite legacy URLs.
+ *
+ * This is a *temporary* filter to rewrite old-style URLs to new-style
+ * URLs (clean URLs).  Currently, URLs are being rewritten dynamically
+ * (ie. "on output"), however when these rewrite rules have been tested
+ * enough, we will use them to permanently rewrite the links in node
+ * and comment bodies.
+ */
+function _legacy_filter_old_urls($text) {
+  if (!variable_get('rewrite_old_urls', 0)) {
+    return $text;
+  }
+
+  global $base_url;
+
+  $end = substr($base_url, 12);
+
+  if (variable_get('clean_url', '0') == '0') {
+    // Relative URLs:
+
+    // rewrite 'node.php?id=[&cid=]' style URLs:
+    $text = eregi_replace("\"(node)\.php\?id=([[:digit:]]+)(&cid=)?([[:digit:]]*)", "\"?q=\\1/view/\\2/\\4", $text);
+
+    // rewrite 'module.php?mod={&=}' style URLs:
+    $text = ereg_replace("\"module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))", "\"?q=\\2/\\4/\\6" , $text);
+    $text = ereg_replace("\"module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))", "\"?q=\\2/\\4", $text);
+    $text = ereg_replace("\"module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))", "\"?q=\\2", $text);
+
+    // Absolute URLs:
+
+    // rewrite 'node.php?id=[&cid=]' style URLs:
+    $text = eregi_replace("$end/(node)\.php\?id=([[:digit:]]+)(&cid=)?([[:digit:]]*)", "$end/?q=\\1/view/\\2/\\4", $text);
+
+    // rewrite 'module.php?mod={&=}' style URLs:
+    $text = ereg_replace("$end/module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))", "$end/?q=\\2/\\4/\\6" , $text);
+    $text = ereg_replace("$end/module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))", "$end/?q=\\2/\\4", $text);
+    $text = ereg_replace("$end/module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))", "\"$end/?q=\\2", $text);
+  }
+  else {
+    // Relative URLs:
+
+    // Rewrite 'node.php?id=[&cid=]' style URLs:
+    $text = eregi_replace("\"(node)\.php\?id=([[:digit:]]+)(&cid=)?([[:digit:]]*)", "\"\\1/view/\\2/\\4", $text);
+
+    // Rewrite 'module.php?mod={&=}' style URLs:
+    $text = ereg_replace("\"module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))", "\"\\2/\\4/\\6", $text);
+    $text = ereg_replace("\"module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))", "\"\\2/\\4", $text);
+    $text = ereg_replace("\"module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))", "\"\\2", $text);
+
+    // Absolute URLs:
+
+    // Rewrite 'node.php?id=[&cid=]' style URLs:
+    $text = eregi_replace("$end/(node)\.php\?id=([[:digit:]]+)(&cid=)?([[:digit:]]*)", "$end/\\1/view/\\2/\\4", $text);
+
+    // Rewrite 'module.php?mod={&=}' style URLs:
+    $text = ereg_replace("$end/module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))", "$end/\\2/\\4/\\6", $text);
+    $text = ereg_replace("$end/module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))(&?[[:alpha:]]+=([[:alnum:]]+))", "$end/\\2/\\4", $text);
+    $text = ereg_replace("$end/module\.php\?(&?[[:alpha:]]+=([[:alnum:]]+))", "$end/\\2", $text);
+  }
+
+  return $text;
+}
+
+
diff --git a/modules/locale.module b/modules/locale.module
new file mode 100644
index 0000000..87f7aaf
--- /dev/null
+++ b/modules/locale.module
@@ -0,0 +1,417 @@
+'. t('The locale module allows you to present your Drupal site in a language other than the default English. You can use it to set up a multi-lingual web site or replace given built-in text with text which has been customized for your site. Whenever the locale module encounters text which needs to be displayed, it tries to translate it into the currently selected language. If a translation is not available, then the string is remembered, so you can look up untranslated strings easily.') .'
                          ';
+      $output .= '
                          '. t('The locale module provides two options for providing translations. The first is the integrated web interface, via which you can search for untranslated strings, and specify their translations. An easier and less time-consuming method is to import existing translations for your language.  These translations are available as GNU gettext Portable Object files (.po files for short).  Translations for many languages are available for download from the translation page.') .'
                          ';
+      $output .= '
                          '. t('If an existing translation does not meet your needs, the .po files are easily edited with special editing tools. The locale module\'s import feature allows you to add strings from such files into your site\'s database. The export functionality enables you to share your translations with others, generating Portable Object files from your site strings.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%admin-locale' => url('admin/locale'), '%admin-locale-string-search' => url('admin/locale/string/search'), '%admin-locale-language-add' => url('admin/locale/language/add'), '%external-http-drupal-org-project-Translations' => 'http://drupal.org/project/Translations'));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Locale page.', array('%locale' => 'http://drupal.org/handbook/modules/locale/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Enables the translation of the user interface to languages other than English.');
+    case 'admin/locale':
+    case 'admin/locale/language/overview':
+      return t("
                          Drupal provides support for the translation of its interface text into different languages.  This page provides an overview of the installed languages. You can add a language on the add language page, or directly by importing a translation. If multiple languages are enabled, registered users will be able to set their preferred language.  The site default will be used for anonymous visitors and for users without their own settings.
                          Drupal interface translations may be added or extended by several courses: by importing an existing translation, by translating everything from scratch, or by a combination of these approaches.
                          ", array("%search" => url("admin/locale/string/search"), "%import" => url("admin/locale/language/import"), "%add-language" => url("admin/locale/language/add")));
+    case 'admin/locale/language/add':
+      return t("
                          You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardised for the desired language. You can also add a language by importing a translation.
                          ", array("%import" => url("admin/locale/language/import")));
+    case 'admin/locale/language/import':
+      return t("
                          This page allows you to import a translation provided in the gettext Portable Object (.po) format.  The easiest way to get your site translated is to obtain an existing Drupal translation and to import it.  You can find existing translations on the Drupal translation page. Note that importing a translation file might take a while.
                          ", array('%url' => 'http://drupal.org/project/translations'));
+    case 'admin/locale/language/export':
+      return t("
                          This page allows you to export Drupal strings. The first option is to export a translation so it can be shared.  The second option generates a translation template, which contains all Drupal strings, but without their translations. You can use this template to start a new translation using various software packages designed for this task.
                          ");
+    case 'admin/locale/string/search':
+      return t("
                          It is often convenient to get the strings from your setup on the export page, and use a desktop Gettext translation editor to edit the translations.  On this page you can search in the translated and untranslated strings, and the default English texts provided by Drupal.
                          ", array("%export" => url("admin/locale/language/export")));
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function locale_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $access = user_access('administer locales');
+
+    // Main admin menu item
+    $items[] = array('path' => 'admin/locale',
+      'title' => t('localization'),
+      'callback' => 'locale_admin_manage',
+      'access' => $access);
+
+    // Top level tabs
+    $items[] = array('path' => 'admin/locale/language',
+      'title' => t('manage languages'),
+      'access' => $access,
+      'weight' => -10,
+      'type' => MENU_DEFAULT_LOCAL_TASK);
+    $items[] = array('path' => 'admin/locale/string/search',
+      'title' => t('manage strings'),
+      'callback' => 'locale_string_search',
+      'access' => $access,
+      'weight' => 10,
+      'type' => MENU_LOCAL_TASK);
+
+    // Manage languages subtabs
+    $items[] = array('path' => 'admin/locale/language/overview',
+      'title' => t('list'),
+      'callback' => 'locale_admin_manage',
+      'access' => $access,
+      'weight' => 0,
+      'type' => MENU_DEFAULT_LOCAL_TASK);
+    $items[] = array('path' => 'admin/locale/language/add',
+      'title' => t('add language'),
+      'callback' => 'locale_admin_manage_add',
+      'access' => $access,
+      'weight' => 5,
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/locale/language/import',
+      'title' => t('import'),
+      'callback' => 'locale_admin_import',
+      'access' => $access,
+      'weight' => 10,
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/locale/language/export',
+      'title' => t('export'),
+      'callback' => 'locale_admin_export',
+      'access' => $access,
+      'weight' => 20,
+      'type' => MENU_LOCAL_TASK);
+
+    // Language related callbacks
+    $items[] = array('path' => 'admin/locale/language/delete',
+      'title' => t('confirm'),
+      'callback' => 'locale_admin_manage_delete_form',
+      'access' => $access,
+      'type' => MENU_CALLBACK);
+  }
+  else {
+    if (is_numeric(arg(4))) {
+      // String related callbacks
+      $items[] = array('path' => 'admin/locale/string/edit/'. arg(4),
+        'title' => t('edit string'),
+        'callback' => 'locale_admin_string_edit',
+        'callback arguments' => arg(4),
+        'access' => $access,
+        'type' => MENU_CALLBACK);
+      $items[] = array('path' => 'admin/locale/string/delete/'. arg(4),
+        'title' => t('delete string'),
+        'callback' => 'locale_admin_string_delete',
+        'callback arguments' => arg(4),
+        'access' => $access,
+        'type' => MENU_CALLBACK);
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function locale_perm() {
+  return array('administer locales');
+}
+
+/**
+ * Implementation of hook_user().
+ */
+function locale_user($type, $edit, &$user, $category = NULL) {
+  $languages = locale_supported_languages();
+  if ($type == 'form' && $category == 'account' && count($languages['name']) > 1) {
+    if ($user->language == '') {
+      $user->language = key($languages['name']);
+    }
+    $languages['name'] = array_map('check_plain', $languages['name']);
+    $form['locale'] = array('#type' => 'fieldset',
+      '#title' => t('Interface language settings'),
+      '#weight' => 1,
+    );
+    $form['locale']['language'] = array('#type' => 'radios',
+      '#title' => t('Language'),
+      '#default_value' => $user->language,
+      '#options' => $languages['name'],
+      '#description' => t('Selecting a different locale will change the interface language of the site.'),
+    );
+    return $form;
+  }
+}
+
+// ---------------------------------------------------------------------------------
+// Locale core functionality (needed on all page loads)
+
+/**
+ * Provides interface translation services.
+ *
+ * This function is called from t() to translate a string if needed.
+ */
+function locale($string) {
+  global $locale;
+  static $locale_t;
+
+  // Store database cached translations in a static var.
+  if (!isset($locale_t)) {
+    $cache = cache_get("locale:$locale");
+
+    if ($cache == 0) {
+      locale_refresh_cache();
+      $cache = cache_get("locale:$locale");
+    }
+    $locale_t = unserialize($cache->data);
+  }
+
+  // We have the translation cached (if it is TRUE, then there is no
+  // translation, so there is no point in checking the database)
+  if (isset($locale_t[$string])) {
+    $string = ($locale_t[$string] === TRUE ? $string : $locale_t[$string]);
+  }
+
+  // We do not have this translation cached, so get it from the DB.
+  else {
+    $result = db_query("SELECT s.lid, t.translation FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid WHERE s.source = '%s' AND t.locale = '%s'", $string, $locale);
+    // Translation found
+    if ($trans = db_fetch_object($result)) {
+      if (!empty($trans->translation)) {
+        $locale_t[$string] = $trans->translation;
+        $string = $trans->translation;
+      }
+    }
+
+    // Either we have no such source string, or no translation
+    else {
+      $result = db_query("SELECT lid, source FROM {locales_source} WHERE source = '%s'", $string);
+      // We have no such translation
+      if ($obj = db_fetch_object($result)) {
+        if ($locale) {
+          db_query("INSERT INTO {locales_target} (lid, locale, translation) VALUES (%d, '%s', '')", $obj->lid, $locale);
+        }
+      }
+      // We have no such source string
+      else {
+        db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", request_uri(), $string);
+        if ($locale) {
+          $lid = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $string));
+          db_query("INSERT INTO {locales_target} (lid, locale, translation) VALUES (%d, '%s', '')", $lid->lid, $locale);
+        }
+      }
+      // Clear locale cache in DB
+      cache_clear_all("locale:$locale");
+    }
+  }
+
+  return $string;
+}
+
+/**
+ * Refreshes database stored cache of translations.
+ *
+ * We only store short strings to improve performance and consume less memory.
+ */
+function locale_refresh_cache() {
+  $languages = locale_supported_languages();
+
+  foreach (array_keys($languages['name']) as $locale) {
+    $result = db_query("SELECT s.source, t.translation, t.locale FROM {locales_source} s INNER JOIN {locales_target} t ON s.lid = t.lid WHERE t.locale = '%s' AND LENGTH(s.source) < 75", $locale);
+    $t = array();
+    while ($data = db_fetch_object($result)) {
+      $t[$data->source] = (empty($data->translation) ? TRUE : $data->translation);
+    }
+    cache_set("locale:$locale", serialize($t));
+  }
+}
+
+/**
+ * Returns list of languages supported on this site.
+ *
+ * @param $reset Refresh cached language list.
+ * @param $getall Return all languages (even disabled ones)
+ */
+function locale_supported_languages($reset = FALSE, $getall = FALSE) {
+  static $enabled = NULL;
+  static $all = NULL;
+
+  if ($reset) {
+    unset($enabled); unset($all);
+  }
+
+  if (is_null($enabled)) {
+    $enabled = $all = array();
+    $all['name'] = $all['formula'] = $enabled['name'] = $enabled['formula'] = array();
+    $result = db_query('SELECT locale, name, formula, enabled FROM {locales_meta} ORDER BY isdefault DESC, enabled DESC, name ASC');
+    while ($row = db_fetch_object($result)) {
+      $all['name'][$row->locale] = $row->name;
+      $all['formula'][$row->locale] = $row->formula;
+      if ($row->enabled) {
+        $enabled['name'][$row->locale] = $row->name;
+        $enabled['formula'][$row->locale] = $row->formula;
+      }
+    }
+  }
+  return $getall ? $all : $enabled;
+}
+
+/**
+ * Returns plural form index for a specific number.
+ *
+ * The index is computed from the formula of this language.
+ */
+function locale_get_plural($count) {
+  global $locale;
+  static $locale_formula, $plurals = array();
+
+  if (!isset($plurals[$count])) {
+    if (!isset($locale_formula)) {
+      $languages = locale_supported_languages();
+      $locale_formula = $languages['formula'][$locale];
+    }
+    if ($locale_formula) {
+      $n = $count;
+      $plurals[$count] = @eval("return intval($locale_formula);");
+      return $plurals[$count];
+    }
+    else {
+      $plurals[$count] = -1;
+      return -1;
+    }
+  }
+  return $plurals[$count];
+}
+
+// ---------------------------------------------------------------------------------
+// Language management functionality (administration only)
+
+/**
+ * Page handler for the language management screen.
+ */
+function locale_admin_manage() {
+  include_once './includes/locale.inc';
+  return _locale_admin_manage_screen();
+}
+
+/**
+ * User interface for the language deletion confirmation screen.
+ */
+function locale_admin_manage_delete_form() {
+  include_once './includes/locale.inc';
+  $langcode = arg(4);
+
+  // Do not allow deletion of English locale.
+  if ($langcode == 'en') {
+    drupal_set_message(t('The English locale cannot be deleted.'));
+    drupal_goto('admin/locale/language/overview');
+  }
+
+  // For other locales, warn user that data loss is ahead.
+  $languages = locale_supported_languages(FALSE, TRUE);
+
+  if (!isset($languages['name'][$langcode])) {
+    drupal_not_found();
+  }
+  else {
+    $form['langcode'] = array('#type' => 'value', '#value' => $langcode);
+    return confirm_form('locale_admin_manage_delete_form', $form, t('Are you sure you want to delete the language %name?', array('%name' => theme('placeholder', t($languages['name'][$langcode])))), 'admin/locale/language/overview', t('Deleting a language will remove all data associated with it. This action cannot be undone.'), t('Delete'), t('Cancel'));
+  }
+}
+
+/**
+ * Process language deletion submissions.
+ */
+function locale_admin_manage_delete_form_submit($form_id, $form_values) {
+  $languages = locale_supported_languages(FALSE, TRUE);
+  if (isset($languages['name'][$form_values['langcode']])) {
+    db_query("DELETE FROM {locales_meta} WHERE locale = '%s'", $form_values['langcode']);
+    db_query("DELETE FROM {locales_target} WHERE locale = '%s'", $form_values['langcode']);
+    $message = t('The language %locale has been removed.', array('%locale' => theme('placeholder', t($languages['name'][$form_values['langcode']]))));
+    drupal_set_message($message);
+    watchdog('locale', $message);
+  }
+
+  // Changing the locale settings impacts the interface:
+  cache_clear_all();
+
+  return 'admin/locale/language/overview';
+}
+
+/**
+ * Page handler for the language addition screen
+ */
+function locale_admin_manage_add() {
+  include_once './includes/locale.inc';
+  return _locale_admin_manage_add_screen();
+}
+
+// ---------------------------------------------------------------------------------
+// Gettext Portable Object import functionality (administration only)
+
+/**
+ * Page handler for the translation import screen
+ */
+function locale_admin_import() {
+  include_once './includes/locale.inc';
+  return _locale_admin_import_screen();
+}
+
+// ---------------------------------------------------------------------------------
+// Gettext Portable Object export functionality (administration only)
+
+/**
+ * Page handler for the translation export screen
+ */
+function locale_admin_export() {
+  include_once './includes/locale.inc';
+  return _locale_admin_export_screen();
+}
+
+// ---------------------------------------------------------------------------------
+// String search and editing functionality (administration only)
+
+/**
+ * Page handler for the string search.
+ */
+function locale_string_search() {
+  include_once './includes/locale.inc';
+  $output = _locale_string_seek();
+  $output .= _locale_string_seek_form();
+  return $output;
+}
+
+/**
+ * Display the string edit form.
+ */
+function locale_admin_string_edit($lid) {
+  include_once './includes/locale.inc';
+  return _locale_string_edit($lid);
+}
+
+/**
+ * Delete a string.
+ */
+function locale_admin_string_delete($lid) {
+  include_once './includes/locale.inc';
+  _locale_string_delete($lid);
+}
diff --git a/modules/menu.module b/modules/menu.module
new file mode 100644
index 0000000..e950144
--- /dev/null
+++ b/modules/menu.module
@@ -0,0 +1,764 @@
+Menus are a collection of links (menu items) used to navigate a website. The menu module provides an interface to control and customize the powerful menu system that comes with Drupal.  Menus are primarily displayed as a hierarchical list of links using Drupal\'s highly flexible blocks feature. Each menu automatically creates a block of the same name. By default, new menu items are placed inside a built-in menu labelled %navigation, but administrators can also create custom menus.
                          
+
                          Drupal themes generally provide out-of-the-box support for two menus commonly labelled %primary-links and %secondary-links. These are sets of links which are usually displayed in the header or footer of each page (depending on the currently active theme). Any menu can be designated as the primary or secondary links menu via the menu settings page.
                          
+Menu administration tabs:
+
                            
+  
                          • On the administer menu page, administrators can "edit" to change the title, description, parent or weight of a menu item. Under the "operations" column, click on "enable/disable" to toggle a menu item on or off. Only menu items which are enabled are displayed in the corresponding menu block. Note that the default menu items generated by the menu module cannot be deleted, only disabled.
                            • 
+  
                          • Use the "add menu" tab to submit a title for a new custom menu. Once submitted, the menu will appear in a list toward the bottom of the administer menu page underneath the main navigation menu. Under the menu name there will be links to edit or delete the menu, and a link to add new items to the menu.
                            • 
+  
                          • Use the "add menu item" tab to create new links in either the navigation or a custom menu (such as a primary/secondary links menu). Select the parent item to place the new link within an existing menu structure. For top level menu items, choose the name of the menu in which the link is to be added.
                            • 
+
                          ', array('%navigation' => theme('placeholder', 'Navigation'), '%primary-links' => theme('placeholder', 'primary links'), '%secondary-links' => theme('placeholder', 'secondary links'), '%admin-block' => url('admin/block'), '%menu-settings' => url('admin/settings/menu')));
+      $output .= t('
                          You can
                          
+
+', array('%admin-menu' => url('admin/menu'), '%admin-block' => url('admin/block'), '%admin-menu-menu-add' => url('admin/menu/menu/add'), '%admin-menu-item-add' => url('admin/menu/item/add'), '%admin-settings-menus' => url('admin/settings/menu')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Menu page.', array('%menu' => 'http://drupal.org/handbook/modules/menu/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Allows administrators to customize the site navigation menu.');
+    case 'admin/menu':
+      return '
                          '. t('Menus are a collection of links (menu items) used to navigate a website. The list(s) below display the currently available menus along with their menu items. Select an operation from the list to manage each menu or menu item.', array('%admin-settings-menus' => url('admin/settings/menu'), '%admin-block'=>url('admin/block'))) .'
                          ';
+    case 'admin/menu/menu/add':
+      return '
                          '. t('Enter the name for your new menu. Remember to enable the newly created block in the blocks administration page.', array('%blocks' => url('admin/block'))) .'
                          ';
+    case 'admin/menu/item/add':
+      return '
                          '. t('Enter the title, path, position and the weight for your new menu item.') .'
                          ';
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function menu_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'admin/menu',
+      'title' => t('menus'),
+      'callback' => 'menu_overview',
+      'access' => user_access('administer menu'));
+    $items[] = array('path' => 'admin/menu/list',
+      'title' => t('list'),
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+      'weight' => -10);
+
+    $items[] = array('path' => 'admin/menu/item/add',
+      'title' => t('add menu item'),
+      'callback' => 'menu_edit_item_form',
+      'access' => user_access('administer menu'),
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/menu/item/edit',
+      'title' => t('edit menu item'),
+      'callback' => 'menu_edit_item_form',
+      'access' => user_access('administer menu'),
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/menu/item/reset',
+      'title' => t('reset menu item'),
+      'callback' => 'menu_reset_item',
+      'access' => user_access('administer menu'),
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/menu/item/disable',
+      'title' => t('disable menu item'),
+      'callback' => 'menu_disable_item',
+      'access' => user_access('administer menu'),
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/menu/item/delete',
+      'title' => t('delete menu item'),
+      'callback' => 'menu_item_delete_form',
+      'access' => user_access('administer menu'),
+      'type' => MENU_CALLBACK);
+
+    $items[] = array('path' => 'admin/menu/menu/add',
+      'title' => t('add menu'),
+      'callback' => 'menu_edit_menu_form',
+      'access' => user_access('administer menu'),
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/menu/menu/edit',
+      'title' => t('edit menu'),
+      'callback' => 'menu_edit_menu_form',
+      'access' => user_access('administer menu'),
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/menu/menu/delete',
+      'title' => t('delete menu'),
+      'callback' => 'menu_item_delete_form',
+      'access' => user_access('administer menu'),
+      'type' => MENU_CALLBACK);
+
+    $items[] = array('path' => 'admin/settings/menu',
+      'title' => t('menus'),
+      'callback' => 'menu_configure');
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_block().
+ */
+function menu_block($op = 'list', $delta = 0) {
+  if ($op == 'list') {
+    $blocks = array();
+    $root_menus = menu_get_root_menus();
+    foreach ($root_menus as $mid => $title) {
+      // Default "Navigation" block is handled by user.module.
+      if ($mid != 1) {
+        $blocks[$mid]['info'] = check_plain($title);
+      }
+    }
+    return $blocks;
+  }
+  else if ($op == 'view') {
+    $item = menu_get_item($delta);
+    $data['subject'] = check_plain($item['title']);
+    $data['content'] = theme('menu_tree', $delta);
+    return $data;
+  }
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ */
+function menu_nodeapi(&$node, $op) {
+
+  if (user_access('administer menu')) {
+    switch ($op) {
+      case 'insert':
+      case 'update':
+        if ($node->menu['delete']) {
+          menu_node_form_delete($node);
+          menu_rebuild();
+        }
+        elseif ($node->menu['title']) {
+          $node->menu['path'] = ($node->menu['path']) ? $node->menu['path'] : "node/$node->nid";
+          menu_edit_item_save($node->menu);
+          menu_rebuild();
+        }
+        break;
+
+      case 'delete':
+        menu_node_form_delete($node);
+        menu_rebuild();
+        break;
+    }
+  }
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function menu_perm() {
+  return array('administer menu');
+}
+
+/**
+ * Implementation of hook_form_alter().
+ * Add menu item fields to the node form.
+ */
+function menu_form_alter($form_id, &$form) {
+  if (user_access('administer menu') && isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    $edit = isset($_POST['edit']) ? $_POST['edit'] : '';
+    $edit['nid'] = $form['nid']['#value'];
+
+    $item = array();
+    if ($edit['nid'] > 0) {
+      $item = db_fetch_array(db_query("SELECT * FROM {menu} WHERE path = 'node/%d'", $edit['nid']));
+      if (is_array($edit['menu'])) {
+        $item = !is_array($item) ? $edit['menu'] : (($_POST['op'] == t('Preview')) ? array_merge($item, $edit['menu']) : array_merge($edit['menu'], $item));
+      }
+    }
+
+    $form['menu'] = array('#type' => 'fieldset',
+      '#title' => t('Menu settings'),
+      '#collapsible' => TRUE,
+      '#collapsed' => empty($item['title']),
+      '#tree' => TRUE,
+      '#weight' => 30,
+    );
+
+    $form['menu']['title'] = array('#type' => 'textfield',
+      '#title' => t('Title'),
+      '#default_value' => $item['title'],
+      '#description' => t('The name to display for this link.'),
+    );
+
+    $form['menu']['description'] = array('#type' => 'textfield',
+      '#title' => t('Description'),
+      '#default_value' => $item['description'],
+      '#description' => t('The description displayed when hovering over a menu item.'),
+    );
+
+    // Generate a list of possible parents.
+    $options = menu_parent_options($item['mid'], variable_get('menu_parent_items', 0));
+
+    $form['menu']['pid'] = array('#type' => 'select',
+      '#title' => t('Parent item'),
+      '#default_value' => $item['pid'],
+      '#options' => $options,
+    );
+
+    $form['menu']['path'] = array('#type' => 'hidden',
+      '#value' => $item['path'],
+    );
+
+    $form['menu']['weight'] = array('#type' => 'weight',
+      '#title' => t('Weight'),
+      '#default_value' => $item['weight'],
+      '#delta' => 10,
+      '#description' => t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.'),
+    );
+
+    $form['menu']['mid'] = array('#type' => 'hidden',
+      '#value' => $item['mid'] ? $item['mid'] : 0,
+    );
+
+    $form['menu']['type'] = array('#type' => 'hidden',
+      '#value' => $item['type'] ? $item['type'] : MENU_CUSTOM_ITEM,
+    );
+
+    if ($item['mid'] > 0) {
+      $form['menu']['delete'] = array('#type' => 'checkbox',
+        '#title' => t('Check to delete this menu item.'),
+        '#default_value' => $item['delete'],
+      );
+
+      $form['menu']['advanced'] = array('#type' => 'item',
+        '#value' => t('You may also edit the advanced settings for this menu item.', array('%edit' => url("admin/menu/item/edit/{$item['mid']}"))),
+      );
+    }
+  }
+}
+
+/**
+ * Menu callback; presents menu configuration options.
+ */
+function menu_configure() {
+  $menu = menu_get_menu();
+  $root_menus = menu_get_root_menus();
+
+  $primary_options = $root_menus;
+  $primary_options[0] = t('No primary links');
+
+  $form['settings_links'] = array('#type' => 'fieldset',
+    '#title' => t('Primary and secondary links settings'),
+  );
+
+  $form['settings_links']['intro'] = array('#type' => 'item',
+    '#value' => t('Primary and secondary links provide a navigational menu system which usually (depending on your theme) appears at the top-right of the browser window. The links displayed can be generated either from a custom list created via the menu administration page or from a built-in list of menu items such as the navigation menu links.', array('%menu' => url('admin/menu'))),
+  );
+
+  $form['settings_links']['menu_primary_menu'] = array('#type' => 'select',
+    '#title' => t('Menu containing primary links'),
+    '#default_value' => variable_get('menu_primary_menu', 0),
+    '#options' => $primary_options,
+  );
+
+  $secondary_options = $root_menus;
+  $secondary_options[0] = t('No secondary links');
+
+  $form['settings_links']['menu_secondary_menu'] = array('#type' => 'select',
+    '#title' => t('Menu containing secondary links'),
+    '#default_value' => variable_get('menu_secondary_menu', 0),
+    '#options' => $secondary_options,
+    '#description' => t('If you select the same menu as primary links then secondary links will display the appropriate second level of your navigation hierarchy.'),
+  );
+
+  $form['settings_authoring'] = array('#type' => 'fieldset',
+    '#title' => t('Post authoring form settings'),
+  );
+
+  $form['settings_authoring']['intro'] = array('#type' => 'item',
+    '#value' => t('The menu module allows on-the-fly creation of menu links in the post authoring forms. The following option limits the menus in which a new link may be added. For e.g. this can be used to force new menu items to be created in the primary links menu or to hide admin menu items.'),
+  );
+
+  $authoring_options = $root_menus;
+  $authoring_options[0] = t('Show all menus');
+
+  $form['settings_authoring']['menu_parent_items'] = array('#type' => 'select',
+    '#title' => t('Restrict parent items to'),
+    '#default_value' => variable_get('menu_parent_items', 0),
+    '#options' => $authoring_options,
+    '#description' => t('Choose the menu to be made available in the post authoring form. Only this menu item and its children will be shown.'),
+   );
+
+  return system_settings_form('menu_configure', $form);
+}
+
+/**
+ * Menu callback; handle the adding/editing of a new menu.
+ */
+function menu_edit_menu_form($mid = 0) {
+  if (arg(3) == 'edit') {
+    if (!($item = db_fetch_array(db_query('SELECT * FROM {menu} WHERE mid = %d', $mid)))) {
+      drupal_not_found();
+      return;
+    }
+  }
+  else {
+    $item = array('mid' => 0, 'pid' => 0, 'path' => '', 'weight' => 0, 'type' => MENU_CUSTOM_MENU);
+  }
+  $form['title'] = array('#type' => 'textfield',
+    '#title' => t('Title'),
+    '#default_value' => $item['title'],
+    '#description' => t('The name of the menu.'),
+    '#required' => TRUE,
+  );
+  $form['mid'] = array('#type' => 'value', '#value' => $item['mid']);
+  $form['pid'] = array('#type' => 'value', '#value' => $item['pid']);
+  $form['path'] = array('#type' => 'value', '#value' => $item['path']);
+  $form['weight'] = array('#type' => 'value', '#value' => $item['weight']);
+  $form['type'] = array('#type' => 'value', '#value' => $item['type']);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
+
+  // Reuse the submit function of menu_edit_item_form.
+  return drupal_get_form('menu_edit_menu_form', $form, 'menu_edit_item_form');
+}
+
+/**
+ * Present the menu item editing form.
+ */
+function menu_edit_item_form($mid = 0) {
+  if (arg(3) == 'edit') {
+    if (!($item = db_fetch_array(db_query('SELECT * FROM {menu} WHERE mid = %d', $mid)))) {
+      drupal_not_found();
+      return;
+    }
+  }
+  else {
+    // This is an add form.
+    // The mid argument (if set) will be the default pid to use.
+    // Otherwise, we default to the "Navigation" menu (pid #1).
+    $default_pid = $mid ? $mid : 1;
+    $item = array('mid' => 0, 'pid' => $default_pid, 'weight' => 0, 'type' => MENU_CUSTOM_ITEM);
+  }
+
+  $form['title'] = array('#type' => 'textfield',
+    '#title' => t('Title'),
+    '#default_value' => $item['title'],
+    '#description' => t('The name of the menu item.'),
+    '#required' => TRUE,
+  );
+  $form['description'] = array('#type' => 'textfield',
+    '#title' => t('Description'),
+    '#default_value' => $item['description'],
+    '#description' => t('The description displayed when hovering over a menu item.'),
+  );
+
+  if ($item['type'] & MENU_CREATED_BY_ADMIN) {
+    $form['path'] = array('#type' => 'textfield',
+      '#title' => t('Path'),
+      '#default_value' => $item['path'],
+      '#description' => t('The path this menu item links to. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => theme('placeholder', ''), '%add-node' => theme('placeholder', 'node/add'), '%drupal' => theme('placeholder', 'http://drupal.org'))),
+      '#required' => TRUE,
+    );
+  }
+  else {
+    $form['_path'] = array('#type' => 'item',
+      '#title' => t('Path'),
+      '#description' => l($item['path'], $item['path']),
+    );
+    $form['path'] = array('#type' => 'value', '#value' => $item['path']);
+  }
+
+  $expanded = $item['type'] & MENU_EXPANDED ? 1 : 0;
+  $form['expanded'] = array('#type' => 'checkbox',
+    '#title' => t('Expanded'),
+    '#default_value' => $expanded,
+    '#description' => t('If selected and this menu item has children, the menu will always appear expanded.'),
+  );
+
+  // Generate a list of possible parents (not including this item or descendants).
+  $options = menu_parent_options($item['mid']);
+  $form['pid'] = array('#type' => 'select',
+    '#title' => t('Parent item'),
+    '#default_value' => $item['pid'],
+    '#options' => $options,
+  );
+  $form['weight'] = array('#type' => 'weight',
+    '#title' => t('Weight'),
+    '#default_value' => $item['weight'],
+    '#description' => t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.'),
+  );
+
+  // Always enable menu items (but not menus) when editing them.
+  if (!($item['type'] & MENU_IS_ROOT)) {
+    $item['type'] |= MENU_VISIBLE_IN_TREE | MENU_VISIBLE_IN_BREADCRUMB;
+  }
+
+  $form['type'] = array('#type' => 'value', '#value' => $item['type']);
+  $form['mid'] = array('#type' => 'value', '#value' => $item['mid']);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
+
+  return drupal_get_form('menu_edit_item_form', $form);
+}
+
+/**
+ * Process menu and menu item add/edit form submissions.
+ */
+function menu_edit_item_form_submit($form_id, $form_values) {
+  menu_edit_item_save($form_values);
+  return 'admin/menu';
+}
+
+/**
+ * Menu callback; delete a single custom item.
+ */
+function menu_item_delete_form($mid) {
+  if (!($menu = db_fetch_object(db_query('SELECT type, title FROM {menu} WHERE mid = %d', $mid)))) {
+    drupal_not_found();
+    return;
+  }
+
+  $form['mid'] = array('#type' => 'value', '#value' => $mid);
+  $form['type'] = array('#type' => 'value', '#value' => $menu->type);
+  $form['title'] = array('#type' => 'value', '#value' => $menu->title);
+
+  if ($menu->type & MENU_IS_ROOT) {
+    $message = t('Are you sure you want to delete the menu %item?', array('%item' => theme('placeholder', $menu->title)));
+  }
+  else {
+    $message = t('Are you sure you want to delete the custom menu item %item?', array('%item' => theme('placeholder', $menu->title)));
+  }
+
+  return confirm_form('menu_confirm_delete_form', $form, $message, 'admin/menu', t('This action cannot be undone.'), t('Delete'));
+}
+
+/**
+ * Process menu delete form submissions.
+ */
+function menu_confirm_delete_form_submit($form_id, $form_values) {
+  menu_delete_item($form_values['mid']);
+
+  $t_args = array('%title' => theme('placeholder', $form_values['title']));
+  if ($form_values['type'] & MENU_IS_ROOT) {
+    drupal_set_message(t('The menu %title has been deleted.', $t_args));
+    watchdog('menu', t('Deleted menu %title.', $t_args), WATCHDOG_NOTICE);
+  }
+  else {
+    drupal_set_message(t('The menu item %title has been deleted.', $t_args));
+    watchdog('menu', t('Deleted menu item %title.', $t_args), WATCHDOG_NOTICE);
+  }
+
+  return 'admin/menu';
+}
+
+/**
+ * Menu callback; reset a single modified item.
+ */
+function menu_reset_item($mid) {
+  if (isset($mid) && $title = db_result(db_query('SELECT title FROM {menu} WHERE mid = %d', $mid))) {
+    $form['mid'] = array('#type' => 'value', '#value' => $mid);
+    return confirm_form('menu_reset_item_form', $form, t('Are you sure you want to reset the item %item to its default values?', array('%item' => theme('placeholder', $title))), 'admin/menu', t('Any customizations will be lost. This action cannot be undone.'), t('Reset'));
+  }
+  else {
+    drupal_not_found();
+  }
+}
+
+/**
+ * Process menu reset item form submissions.
+ */
+function menu_reset_item_form_submit($form_id, $form_values) {
+  menu_delete_item($form_values['mid']);
+  drupal_set_message(t('The menu item was reset to its default settings.'));
+
+  return 'admin/menu';
+}
+
+/**
+ * Menu callback; hide a menu item.
+ */
+function menu_disable_item($mid) {
+  $item = menu_get_item($mid);
+  $type = $item['type'];
+  $type &= ~MENU_VISIBLE_IN_TREE;
+  $type &= ~MENU_VISIBLE_IN_BREADCRUMB;
+  $type |= MENU_MODIFIED_BY_ADMIN;
+  db_query('UPDATE {menu} SET type = %d WHERE mid = %d', $type, $mid);
+  drupal_set_message(t('The menu item has been disabled.'));
+  drupal_goto('admin/menu');
+}
+
+/**
+ * Menu callback; present the main menu management page.
+ */
+function menu_overview() {
+  menu_rebuild();
+
+  return menu_overview_tree();
+}
+
+/**
+ * Save changes to a menu item into the database.
+ *
+ * @return mid
+ */
+function menu_edit_item_save($edit) {
+  if ($edit['expanded']) {
+    $edit['type'] |= MENU_EXPANDED;
+  }
+  else {
+    $edit['type'] &= ~MENU_EXPANDED;
+  }
+
+  $edit['type'] = $edit['type'] | MENU_MODIFIED_BY_ADMIN;
+
+  $status = menu_save_item($edit);
+
+  $t_args = array('%title' => theme('placeholder', $edit['title']));
+  if ($status == SAVED_UPDATED) {
+    drupal_set_message(t('The menu item %title has been updated.', $t_args));
+  }
+  elseif ($status == SAVED_NEW) {
+    drupal_set_message(t('The menu item %title has been added.', $t_args));
+    watchdog('menu', t('Added menu item %title.', $t_args), WATCHDOG_NOTICE, l(t('view'), 'admin/menu'));
+  }
+  return $edit['mid'];
+}
+
+/**
+ * Save a menu item to the database.
+ *
+ * @param $item
+ *   The menu item to be saved. This is passed by reference, so that the newly
+ *   generated $item['mid'] can be accessed after an insert takes place.
+ *
+ * @return $status
+ *   The operation that was performed in saving. Either SAVED_NEW (if a new
+ *   menu item was created), or SAVED_UPDATED (if an existing menu item was
+ *   updated).
+ */
+function menu_save_item(&$item) {
+  $existing_item = NULL;
+
+  // Check that the item already exists in the menu tree, if $item['mid'] is
+  // specified.
+  if (isset($item['mid'])) {
+    $existing_item = menu_get_item($item['mid']);
+  }
+
+  if ($item['mid'] && !empty($existing_item)) {
+    db_query("UPDATE {menu} SET pid = %d, path = '%s', title = '%s', description = '%s', weight = %d, type = %d WHERE mid = %d", $item['pid'], $item['path'], $item['title'], $item['description'], $item['weight'], $item['type'], $item['mid']);
+    return SAVED_UPDATED;
+  }
+  else {
+    $item['mid'] = db_next_id('{menu}_mid');
+    // Check explicitly for mid <= 2. If the database was improperly prefixed,
+    // this would cause a nasty infinite loop or duplicate mid errors.
+    // TODO: have automatic prefixing through an installer to prevent this.
+    while ($item['mid'] <= 2) {
+      $item['mid'] = db_next_id('{menu}_mid');
+    }
+    db_query("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) VALUES (%d, %d, '%s', '%s', '%s', %d, %d)", $item['mid'], $item['pid'], $item['path'], $item['title'], $item['description'], $item['weight'], $item['type']);
+    return SAVED_NEW;
+  }
+}
+
+/**
+ * Delete a menu item from the database. If $item['mid'] is specified, then
+ * this is used to find the existing item; otherwise, $item['path'] is used.
+ *
+ * @param $item
+ *   The menu item to be deleted.
+ */
+function menu_delete_item($item) {
+  if (!is_array($item)) {
+    $item = array('mid' => $item);
+  }
+
+  if ($item['mid']) {
+    db_query('DELETE FROM {menu} WHERE mid = %d', $item['mid']);
+  }
+  elseif ($item['path']) {
+    db_query("DELETE FROM {menu} WHERE path = '%s'", $item['path']);
+  }
+}
+
+/**
+ * Present the menu tree, rendered along with links to edit menu items.
+ */
+function menu_overview_tree() {
+  $menu = menu_get_menu();
+  $root_menus = menu_get_root_menus();
+  $header = array(t('Menu item'), t('Expanded'), array('data' => t('Operations'), 'colspan' => '3'));
+  $output = '';
+
+  foreach ($root_menus as $mid => $title) {
+    $operations = array();
+    if ($menu['items'][$mid]['type'] & MENU_MODIFIABLE_BY_ADMIN) {
+      $operations[] = l(t('edit'), 'admin/menu/menu/edit/'. $mid);
+    }
+    if ($menu['items'][$mid]['type'] & MENU_CREATED_BY_ADMIN) {
+      $operations[] = l(t('delete'), 'admin/menu/menu/delete/'. $mid);
+    }
+    $operations[] = l(t('add item'), 'admin/menu/item/add/'. $mid);
+    $table = theme('item_list', $operations);
+    $table .= theme('table', $header, menu_overview_tree_rows($mid));
+    $output .= theme('box', check_plain($title), $table);
+  }
+  return $output;
+}
+
+function menu_overview_tree_rows($pid = 0, $depth = 0) {
+  $parent_item = menu_get_item($pid);
+  $rows = array();
+
+  if (isset($parent_item) && isset($parent_item['children'])) {
+    usort($parent_item['children'], '_menu_sort');
+    foreach ($parent_item['children'] as $mid) {
+      $item = menu_get_item($mid);
+      // Populate the title field.
+      $title = '';
+      if ($pid == 0) {
+        // Top-level items are menu names, and don't have an associated path.
+        $title .= check_plain($item['title']);
+      }
+      else {
+        $title .= l($item['title'], $item['path']);
+      }
+      if ($depth > 0) {
+        $title = '- '. $title;
+      }
+      for ($i = 1; $i < $depth; $i++) {
+        $title = '  '. $title;
+      }
+
+      // Populate the operations field.
+      $operations = array();
+      if (!($item['type'] & MENU_MODIFIABLE_BY_ADMIN)) {
+        $operations[] = array('data' => t('locked'), 'colspan' => '3', 'align' => 'center');
+      }
+      else {
+        // Set the edit column.
+        if ($item['type'] & (MENU_VISIBLE_IN_TREE | MENU_VISIBLE_IF_HAS_CHILDREN)) {
+          $operations[] = array('data' => l(t('edit'), 'admin/menu/item/edit/'. $mid));
+        }
+        else {
+          $operations[] = array('data' => '');
+        }
+
+        // Set the disable column.
+        if ($item['type'] & (MENU_IS_ROOT | MENU_VISIBLE_IF_HAS_CHILDREN)) {
+          // Disabling entire menus is done from block admin page.
+          // MENU_VISIBLE_IF_HAS_CHILDREN menus are always enabled so hide this operation.
+          $operations[] = array('data' => '');
+        }
+        else if ($item['type'] & MENU_VISIBLE_IN_TREE) {
+          $operations[] = array('data' => l(t('disable'), 'admin/menu/item/disable/'. $mid));
+        }
+        else {
+          $operations[] = array('data' => l(t('enable'), 'admin/menu/item/edit/'. $mid));
+        }
+
+        // Set the reset column.
+        if ($item['type'] & MENU_CREATED_BY_ADMIN) {
+          $operations[] = array('data' => l(t('delete'), 'admin/menu/item/delete/'. $mid));
+        }
+        else if ($item['type'] & MENU_MODIFIED_BY_ADMIN) {
+          $operations[] = array('data' => l(t('reset'), 'admin/menu/item/reset/'. $mid));
+        }
+        else {
+          $operations[] = array('data' => '');
+        }
+      }
+
+      // Call out disabled items.
+      if ($item['type'] & (MENU_VISIBLE_IN_TREE | MENU_VISIBLE_IF_HAS_CHILDREN)) {
+        $class = 'menu-enabled';
+      }
+      else {
+        $title .= ' ('. t('disabled') .')';
+        $class = 'menu-disabled';
+      }
+
+      if ($item['type'] & (MENU_MODIFIABLE_BY_ADMIN | MENU_VISIBLE_IN_TREE)) {
+        $row = array(array('data' => $title, 'class' => $class), array('data' => ($item['children'] ? (($item['type'] & MENU_EXPANDED) ? t('Yes') : t('No')) : ''), 'class' => $class));
+        foreach ($operations as $operation) {
+          $operation['class'] = $class;
+          $row[] = $operation;
+        }
+        $rows[] = $row;
+        $rows = array_merge($rows, menu_overview_tree_rows($mid, $depth + 1));
+      }
+      else {
+        // Skip items that are hidden and locked; admins will never care about them.
+        $rows = array_merge($rows, menu_overview_tree_rows($mid, $depth));
+      }
+    }
+  }
+
+  return $rows;
+}
+
+/**
+ * Return a list of menu items that are valid possible parents for the
+ * given menu item. The list excludes the given item and its children.
+ *
+ * @param $mid
+ *   The menu item id for which to generate a list of parents.
+ *   If $mid == 0 then the complete tree is returned.
+ * @param $pid
+ *   The menu item id of the menu item at which to start the tree.
+ *   If $pid > 0 then this item will be included in the tree.
+ * @param $depth
+ *   The current depth in the tree - used when recursing to indent the tree.
+ * @return
+ *   An array of menu titles keyed on the mid.
+ */
+function menu_parent_options($mid, $pid = 0, $depth = 0) {
+  $options = array();
+
+  if (!($parent_item = menu_get_item($pid))) {
+    return $options;
+  }
+
+  // Exclude $mid and its children from the list unless $mid is 0.
+  if ($mid && $mid == $pid) {
+    return $options;
+  }
+
+  // Add the current $pid to the list.
+  if ($pid > 0 && ($parent_item['type'] & (MENU_MODIFIABLE_BY_ADMIN | MENU_IS_ROOT))) {
+    $title = ' '. $parent_item['title'];
+    for ($i = 0; $i < $depth; $i++) {
+      $title = '--'. $title;
+    }
+    if (!($parent_item['type'] & MENU_VISIBLE_IN_TREE)) {
+      $title .= ' ('. t('disabled') .')';
+    }
+    $options[$pid] = $title;
+    $depth ++;
+  }
+
+  // Add children of $pid to the list recursively.
+  if ($parent_item['children']) {
+    usort($parent_item['children'], '_menu_sort');
+    foreach ($parent_item['children'] as $child) {
+      $options += menu_parent_options($mid, $child, $depth);
+    }
+  }
+
+  return $options;
+}
+
+/**
+ * Remove the menu item.
+ */
+function menu_node_form_delete($node) {
+  menu_delete_item(array('path' => 'node/'. $node->nid));
+}
diff --git a/modules/node.module b/modules/node.module
new file mode 100644
index 0000000..7ebfb11
--- /dev/null
+++ b/modules/node.module
@@ -0,0 +1,2481 @@
+'. t('All content in a website is stored and treated as nodes. Therefore nodes are any postings such as blogs, stories, polls and forums. The node module manages these content types and is one of the strengths of Drupal over other content management systems.') .'
                          ';
+      $output .= '
                          '. t('Treating all content as nodes allows the flexibility of creating new types of content. It also allows you to painlessly apply new features or changes to all content. Comments are not stored as nodes but are always associated with a node.') .'
                          ';
+      $output .= t('
                          Node module features
                          
+
                            
+
                          • The list tab provides an interface to search and sort all content on your site.
                            • 
+
                          • The configure settings tab has basic settings for content on your site.
                            • 
+
                          • The configure content types tab lists all content types for your site and lets you configure their default workflow.
                            • 
+
                          • The search tab lets you search all content on your site
                            • 
+
                          
+');
+      $output .= t('
                          You can
                          
+
+', array('%search' => url('search'), '%admin-settings-content-types' => url('admin/settings/content-types')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Node page.', array('%node' => 'http://drupal.org/handbook/modules/node/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Allows content to be submitted to the site and displayed on pages.');
+    case 'admin/node/configure':
+    case 'admin/node/configure/settings':
+      return t('
                          Settings for the core of Drupal. Almost everything is a node so these settings will affect most of the site.
                          ');
+    case 'admin/node':
+      return t('
                          Below is a list of all of the posts on your site. Other forms of content are listed elsewhere (e.g. comments).
                          Clicking a title views the post, while clicking an author\'s name views their user information.
                          ', array('%comments' => url('admin/comment')));
+    case 'admin/node/search':
+      return t('
                          Enter a simple pattern to search for a post. This can include the wildcard character *.
                          For example, a search for "br*" might return "bread bakers", "our daily bread" and "brenda".
                          ');
+  }
+
+  if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'revisions') {
+    return t('The revisions let you track differences between multiple versions of a post.');
+  }
+
+  if (arg(0) == 'node' && arg(1) == 'add' && $type = arg(2)) {
+    return filter_xss_admin(variable_get($type .'_help', ''));
+  }
+}
+
+/**
+ * Implementation of hook_cron().
+ */
+function node_cron() {
+  db_query('DELETE FROM {history} WHERE timestamp < %d', NODE_NEW_LIMIT);
+}
+
+/**
+ * Gather a listing of links to nodes.
+ *
+ * @param $result
+ *   A DB result object from a query to fetch node objects.  If your query joins the node_comment_statistics table so that the comment_count field is available, a title attribute will be added to show the number of comments.
+ * @param $title
+ *   A heading for the resulting list.
+ *
+ * @return
+ *   An HTML list suitable as content for a block.
+ */
+function node_title_list($result, $title = NULL) {
+  while ($node = db_fetch_object($result)) {
+    $items[] = l($node->title, 'node/'. $node->nid, $node->comment_count ? array('title' => format_plural($node->comment_count, '1 comment', '%count comments')) : '');
+  }
+
+  return theme('node_list', $items, $title);
+}
+
+/**
+ * Format a listing of links to nodes.
+ */
+function theme_node_list($items, $title = NULL) {
+  return theme('item_list', $items, $title);
+}
+
+/**
+ * Update the 'last viewed' timestamp of the specified node for current user.
+ */
+function node_tag_new($nid) {
+  global $user;
+
+  if ($user->uid) {
+    if (node_last_viewed($nid)) {
+      db_query('UPDATE {history} SET timestamp = %d WHERE uid = %d AND nid = %d', time(), $user->uid, $nid);
+    }
+    else {
+      @db_query('INSERT INTO {history} (uid, nid, timestamp) VALUES (%d, %d, %d)', $user->uid, $nid, time());
+    }
+  }
+}
+
+/**
+ * Retrieves the timestamp at which the current user last viewed the
+ * specified node.
+ */
+function node_last_viewed($nid) {
+  global $user;
+  static $history;
+
+  if (!isset($history[$nid])) {
+    $history[$nid] = db_fetch_object(db_query("SELECT timestamp FROM {history} WHERE uid = '$user->uid' AND nid = %d", $nid));
+  }
+
+  return (isset($history[$nid]->timestamp) ? $history[$nid]->timestamp : 0);
+}
+
+/**
+ * Decide on the type of marker to be displayed for a given node.
+ *
+ * @param $nid
+ *   Node ID whose history supplies the "last viewed" timestamp.
+ * @param $timestamp
+ *   Time which is compared against node's "last viewed" timestamp.
+ * @return
+ *   One of the MARK constants.
+ */
+function node_mark($nid, $timestamp) {
+  global $user;
+  static $cache;
+
+  if (!$user->uid) {
+    return MARK_READ;
+  }
+  if (!isset($cache[$nid])) {
+    $cache[$nid] = node_last_viewed($nid);
+  }
+  if ($cache[$nid] == 0 && $timestamp > NODE_NEW_LIMIT) {
+    return MARK_NEW;
+  }
+  elseif ($timestamp > $cache[$nid] && $timestamp > NODE_NEW_LIMIT) {
+    return MARK_UPDATED;
+  }
+  return MARK_READ;
+}
+
+/**
+ * Automatically generate a teaser for a node body in a given format.
+ */
+function node_teaser($body, $format = NULL) {
+
+  $size = variable_get('teaser_length', 600);
+
+  // find where the delimiter is in the body
+  $delimiter = strpos($body, '');
+
+  // If the size is zero, and there is no delimiter, the entire body is the teaser.
+  if ($size == 0 && $delimiter === FALSE) {
+    return $body;
+  }
+
+  // We check for the presence of the PHP evaluator filter in the current
+  // format. If the body contains PHP code, we do not split it up to prevent
+  // parse errors.
+  if (isset($format)) {
+    $filters = filter_list_format($format);
+    if (isset($filters['filter/1']) && strpos($body, '' => 4, '
                          ' => 0, '
                          ' => 0, "\n" => 0, '. ' => 1, '! ' => 1, '? ' => 1, '。' => 3, '؟ ' => 1);
+  foreach ($breakpoints as $point => $charnum) {
+    if ($length = strpos($body, $point, $size)) {
+      return substr($body, 0, $length + $charnum);
+    }
+  }
+
+  // If all else fails, we simply truncate the string.
+  return truncate_utf8($body, $size);
+}
+
+function _node_names($op = '', $node = NULL) {
+  static $node_names = array();
+  static $node_list = array();
+
+  if (empty($node_names)) {
+    $node_names = module_invoke_all('node_info');
+    foreach ($node_names as $type => $value) {
+      $node_list[$type] = $value['name'];
+    }
+  }
+  if ($node) {
+    if (is_array($node)) {
+      $type = $node['type'];
+    }
+    elseif (is_object($node)) {
+      $type = $node->type;
+    }
+    elseif (is_string($node)) {
+      $type = $node;
+    }
+    if (!isset($node_names[$type])) {
+      return FALSE;
+    }
+  }
+  switch ($op) {
+    case 'base':
+      return $node_names[$type]['base'];
+    case 'list':
+      return $node_list;
+    case 'name':
+      return $node_list[$type];
+  }
+}
+
+/**
+ * Determine the basename for hook_load etc.
+ *
+ * @param $node
+ *   Either a node object, a node array, or a string containing the node type.
+ * @return
+ *   The basename for hook_load, hook_nodeapi etc.
+ */
+function node_get_base($node) {
+  return _node_names('base', $node);
+}
+
+/**
+ * Determine the human readable name for a given type.
+ *
+ * @param $node
+ *   Either a node object, a node array, or a string containing the node type.
+ * @return
+ *   The human readable name of the node type.
+ */
+function node_get_name($node) {
+  return _node_names('name', $node);
+}
+
+/**
+ * Return the list of available node types.
+ *
+ * @param $node
+ *   Either a node object, a node array, or a string containing the node type.
+ * @return
+ *   An array consisting ('#type' => name) pairs.
+ */
+function node_get_types() {
+  return _node_names('list');
+}
+
+/**
+ * Determine whether a node hook exists.
+ *
+ * @param &$node
+ *   Either a node object, node array, or a string containing the node type.
+ * @param $hook
+ *   A string containing the name of the hook.
+ * @return
+ *   TRUE iff the $hook exists in the node type of $node.
+ */
+function node_hook(&$node, $hook) {
+  return module_hook(node_get_base($node), $hook);
+}
+
+/**
+ * Invoke a node hook.
+ *
+ * @param &$node
+ *   Either a node object, node array, or a string containing the node type.
+ * @param $hook
+ *   A string containing the name of the hook.
+ * @param $a2, $a3, $a4
+ *   Arguments to pass on to the hook, after the $node argument.
+ * @return
+ *   The returned value of the invoked hook.
+ */
+function node_invoke(&$node, $hook, $a2 = NULL, $a3 = NULL, $a4 = NULL) {
+  if (node_hook($node, $hook)) {
+    $function = node_get_base($node) ."_$hook";
+    return ($function($node, $a2, $a3, $a4));
+  }
+}
+
+/**
+ * Invoke a hook_nodeapi() operation in all modules.
+ *
+ * @param &$node
+ *   A node object.
+ * @param $op
+ *   A string containing the name of the nodeapi operation.
+ * @param $a3, $a4
+ *   Arguments to pass on to the hook, after the $node and $op arguments.
+ * @return
+ *   The returned value of the invoked hooks.
+ */
+function node_invoke_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+  $return = array();
+  foreach (module_implements('nodeapi') as $name) {
+    $function = $name .'_nodeapi';
+    $result = $function($node, $op, $a3, $a4);
+    if (isset($result) && is_array($result)) {
+      $return = array_merge($return, $result);
+    }
+    else if (isset($result)) {
+      $return[] = $result;
+    }
+  }
+  return $return;
+}
+
+/**
+ * Load a node object from the database.
+ *
+ * @param $param
+ *   Either the nid of the node or an array of conditions to match against in the database query
+ * @param $revision
+ *   Which numbered revision to load. Defaults to the current version.
+ * @param $reset
+ *   Whether to reset the internal node_load cache.
+ *
+ * @return
+ *   A fully-populated node object.
+ */
+function node_load($param = array(), $revision = NULL, $reset = NULL) {
+  static $nodes = array();
+
+  if ($reset) {
+    $nodes = array();
+  }
+
+  $arguments = array();
+  if (is_numeric($param)) {
+    $cachable = $revision == NULL;
+    if ($cachable && isset($nodes[$param])) {
+      return $nodes[$param];
+    }
+    $cond = 'n.nid = %d';
+    $arguments[] = $param;
+  }
+  else {
+    // Turn the conditions into a query.
+    foreach ($param as $key => $value) {
+      $cond[] = 'n.'. db_escape_string($key) ." = '%s'";
+      $arguments[] = $value;
+    }
+    $cond = implode(' AND ', $cond);
+  }
+
+  // Retrieve the node.
+  // No db_rewrite_sql is applied so as to get complete indexing for search.
+  if ($revision) {
+    array_unshift($arguments, $revision);
+    $node = db_fetch_object(db_query('SELECT n.nid, r.vid, n.type, n.status, n.created, n.changed, n.comment, n.promote, n.moderate, n.sticky, r.timestamp AS revision_timestamp, r.title, r.body, r.teaser, r.log, r.format, u.uid, u.name, u.picture, u.data FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.nid = n.nid AND r.vid = %d WHERE '. $cond, $arguments));
+  }
+  else {
+    $node = db_fetch_object(db_query('SELECT n.nid, n.vid, n.type, n.status, n.created, n.changed, n.comment, n.promote, n.moderate, n.sticky, r.timestamp AS revision_timestamp, r.title, r.body, r.teaser, r.log, r.format, u.uid, u.name, u.picture, u.data FROM {node} n INNER JOIN {users} u ON u.uid = n.uid INNER JOIN {node_revisions} r ON r.vid = n.vid WHERE '. $cond, $arguments));
+  }
+
+  if ($node->nid) {
+    // Call the node specific callback (if any) and piggy-back the
+    // results to the node or overwrite some values.
+    if ($extra = node_invoke($node, 'load')) {
+      foreach ($extra as $key => $value) {
+        $node->$key = $value;
+      }
+    }
+
+    if ($extra = node_invoke_nodeapi($node, 'load')) {
+      foreach ($extra as $key => $value) {
+        $node->$key = $value;
+      }
+    }
+  }
+
+  if ($cachable) {
+    $nodes[$param] = $node;
+  }
+
+  return $node;
+}
+
+/**
+ * Save a node object into the database.
+ */
+function node_save(&$node) {
+  global $user;
+
+  $node->is_new = false;
+
+  // Apply filters to some default node fields:
+  if (empty($node->nid)) {
+    // Insert a new node.
+    $node->is_new = true;
+
+    $node->nid = db_next_id('{node}_nid');
+    $node->vid = db_next_id('{node_revisions}_vid');;
+  }
+  else {
+    // We need to ensure that all node fields are filled.
+    $node_current = node_load($node->nid);
+    foreach ($node as $field => $data) {
+      $node_current->$field = $data;
+    }
+    $node = $node_current;
+
+    if ($node->revision) {
+      $node->old_vid = $node->vid;
+      $node->vid = db_next_id('{node_revisions}_vid');
+    }
+  }
+
+  // Set some required fields:
+  if (empty($node->created)) {
+    $node->created = time();
+  }
+  // The changed timestamp is always updated for bookkeeping purposes (revisions, searching, ...)
+  $node->changed = time();
+
+  // Split off revisions data to another structure
+  $revisions_table_values = array('nid' => $node->nid, 'vid' => $node->vid,
+                     'title' => $node->title, 'body' => $node->body,
+                     'teaser' => $node->teaser, 'log' => $node->log, 'timestamp' => $node->changed,
+                     'uid' => $user->uid, 'format' => $node->format);
+  $revisions_table_types = array('nid' => '%d', 'vid' => '%d',
+                     'title' => "'%s'", 'body' => "'%s'",
+                     'teaser' => "'%s'", 'log' => "'%s'", 'timestamp' => '%d',
+                     'uid' => '%d', 'format' => '%d');
+  $node_table_values = array('nid' => $node->nid, 'vid' => $node->vid,
+                    'title' => $node->title, 'type' => $node->type, 'uid' => $node->uid,
+                    'status' => $node->status, 'created' => $node->created,
+                    'changed' => $node->changed, 'comment' => $node->comment,
+                    'promote' => $node->promote, 'moderate' => $node->moderate,
+                    'sticky' => $node->sticky);
+  $node_table_types = array('nid' => '%d', 'vid' => '%d',
+                    'title' => "'%s'", 'type' => "'%s'", 'uid' => '%d',
+                    'status' => '%d', 'created' => '%d',
+                    'changed' => '%d', 'comment' => '%d',
+                    'promote' => '%d', 'moderate' => '%d',
+                    'sticky' => '%d');
+
+  //Generate the node table query and the
+  //the node_revisions table query
+  if ($node->is_new) {
+    $node_query = 'INSERT INTO {node} ('. implode(', ', array_keys($node_table_types)) .') VALUES ('. implode(', ', $node_table_types) .')';
+    $revisions_query = 'INSERT INTO {node_revisions} ('. implode(', ', array_keys($revisions_table_types)) .') VALUES ('. implode(', ', $revisions_table_types) .')';
+  }
+  else {
+    $arr = array();
+    foreach ($node_table_types as $key => $value) {
+      $arr[] = $key .' = '. $value;
+    }
+    $node_table_values[] = $node->nid;
+    $node_query = 'UPDATE {node} SET '. implode(', ', $arr) .' WHERE nid = %d';
+    if ($node->revision) {
+      $revisions_query = 'INSERT INTO {node_revisions} ('. implode(', ', array_keys($revisions_table_types)) .') VALUES ('. implode(', ', $revisions_table_types) .')';
+    }
+    else {
+      $arr = array();
+      foreach ($revisions_table_types as $key => $value) {
+        $arr[] = $key .' = '. $value;
+      }
+      $revisions_table_values[] = $node->vid;
+      $revisions_query = 'UPDATE {node_revisions} SET '. implode(', ', $arr) .' WHERE vid = %d';
+    }
+  }
+
+  // Insert the node into the database:
+  db_query($node_query, $node_table_values);
+  db_query($revisions_query, $revisions_table_values);
+
+  // Call the node specific callback (if any):
+  if ($node->is_new) {
+    node_invoke($node, 'insert');
+    node_invoke_nodeapi($node, 'insert');
+  }
+  else {
+    node_invoke($node, 'update');
+    node_invoke_nodeapi($node, 'update');
+  }
+
+  // Clear the cache so an anonymous poster can see the node being added or updated.
+  cache_clear_all();
+}
+
+/**
+ * Generate a display of the given node.
+ *
+ * @param $node
+ *   A node array or node object.
+ * @param $teaser
+ *   Whether to display the teaser only, as on the main page.
+ * @param $page
+ *   Whether the node is being displayed by itself as a page.
+ * @param $links
+ *   Whether or not to display node links. Links are omitted for node previews.
+ *
+ * @return
+ *   An HTML representation of the themed node.
+ */
+function node_view($node, $teaser = FALSE, $page = FALSE, $links = TRUE) {
+  $node = (object)$node;
+
+  // Remove the delimiter (if any) that separates the teaser from the body.
+  // TODO: this strips legitimate uses of '' also.
+  $node->body = str_replace('', '', $node->body);
+
+  if ($node->log != '' && !$teaser && $node->moderate) {
+    $node->body .= '
                          '. t('Log') .':
                          '. filter_xss($node->log) .'
                          ';
+  }
+
+  // The 'view' hook can be implemented to overwrite the default function
+  // to display nodes.
+  if (node_hook($node, 'view')) {
+    node_invoke($node, 'view', $teaser, $page);
+  }
+  else {
+    $node = node_prepare($node, $teaser);
+  }
+  // Allow modules to change $node->body before viewing.
+  node_invoke_nodeapi($node, 'view', $teaser, $page);
+  if ($links) {
+    $node->links = module_invoke_all('link', 'node', $node, !$page);
+  }
+  // unset unused $node part so that a bad theme can not open a security hole
+  if ($teaser) {
+    unset($node->body);
+  }
+  else {
+    unset($node->teaser);
+  }
+
+  return theme('node', $node, $teaser, $page);
+}
+
+/**
+ * Apply filters to a node in preparation for theming.
+ */
+function node_prepare($node, $teaser = FALSE) {
+  $node->readmore = (strlen($node->teaser) < strlen($node->body));
+  if ($teaser == FALSE) {
+    $node->body = check_markup($node->body, $node->format, FALSE);
+  }
+  else {
+    $node->teaser = check_markup($node->teaser, $node->format, FALSE);
+  }
+  return $node;
+}
+
+/**
+ * Generate a page displaying a single node, along with its comments.
+ */
+function node_show($node, $cid) {
+  $output = node_view($node, FALSE, TRUE);
+
+  if (function_exists('comment_render') && $node->comment) {
+    $output .= comment_render($node, $cid);
+  }
+
+  // Update the history table, stating that this user viewed this node.
+  node_tag_new($node->nid);
+
+  return $output;
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function node_perm() {
+  return array('administer nodes', 'access content', 'view revisions', 'revert revisions');
+}
+
+/**
+ * Implementation of hook_search().
+ */
+function node_search($op = 'search', $keys = null) {
+  switch ($op) {
+    case 'name':
+      return t('content');
+
+    case 'reset':
+      variable_del('node_cron_last');
+      variable_del('node_cron_last_nid');
+      return;
+
+    case 'status':
+      $last = variable_get('node_cron_last', 0);
+      $last_nid = variable_get('node_cron_last_nid', 0);
+      $total = db_result(db_query('SELECT COUNT(*) FROM {node} WHERE status = 1'));
+      $remaining = db_result(db_query('SELECT COUNT(*) FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid WHERE n.status = 1 AND ((GREATEST(n.created, n.changed, c.last_comment_timestamp) = %d AND n.nid > %d ) OR (n.created > %d OR n.changed > %d OR c.last_comment_timestamp > %d))', $last, $last_nid, $last, $last, $last));
+      return array('remaining' => $remaining, 'total' => $total);
+
+    case 'admin':
+      $form = array();
+      // Output form for defining rank factor weights.
+      $form['content_ranking'] = array('#type' => 'fieldset', '#title' => t('Content ranking'));
+      $form['content_ranking']['#theme'] = 'node_search_admin';
+      $form['content_ranking']['info'] = array('#type' => 'markup', '#value' => ''. t('The following numbers control which properties the content search should favor when ordering the results. Higher numbers mean more influence, zero means the property is ignored. Changing these numbers does not require the search index to be rebuilt.  Changes take effect immediately.') .'');
+
+      $ranking = array('node_rank_relevance' => t('Keyword relevance'),
+                       'node_rank_recent' => t('Recently posted'));
+      if (module_exist('comment')) {
+        $ranking['node_rank_comments'] = t('Number of comments');
+      }
+      if (module_exist('statistics') && variable_get('statistics_count_content_views', 0)) {
+        $ranking['node_rank_views'] = t('Number of views');
+      }
+
+      // Note: reversed to reflect that higher number = higher ranking.
+      $options = drupal_map_assoc(range(0, 10));
+      foreach ($ranking as $var => $title) {
+        $form['content_ranking']['factors'][$var] = array('#title' => $title, '#type' => 'select', '#options' => $options, '#default_value' => variable_get($var, 5));
+      }
+      return $form;
+
+    case 'search':
+      // Build matching conditions
+      list($join1, $where1) = _db_rewrite_sql();
+      $arguments1 = array();
+      $conditions1 = 'n.status = 1';
+
+      if ($type = search_query_extract($keys, 'type')) {
+        $types = array();
+        foreach (explode(',', $type) as $t) {
+          $types[] = "n.type = '%s'";
+          $arguments1[] = $t;
+        }
+        $conditions1 .= ' AND ('. implode(' OR ', $types) .')';
+        $keys = search_query_insert($keys, 'type');
+      }
+
+      if ($category = search_query_extract($keys, 'category')) {
+        $categories = array();
+        foreach (explode(',', $category) as $c) {
+          $categories[] = "tn.tid = %d";
+          $arguments1[] = $c;
+        }
+        $conditions1 .= ' AND ('. implode(' OR ', $categories) .')';
+        $join1 .= ' INNER JOIN {term_node} tn ON n.nid = tn.nid';
+        $keys = search_query_insert($keys, 'category');
+      }
+
+      // Build ranking expression (we try to map each parameter to a
+      // uniform distribution in the range 0..1).
+      $ranking = array();
+      $arguments2 = array();
+      $join2 = '';
+      // Used to avoid joining on node_comment_statistics twice
+      $stats_join = false;
+      if ($weight = (int)variable_get('node_rank_relevance', 5)) {
+        // Average relevance values hover around 0.15
+        $ranking[] = '%d * i.relevance';
+        $arguments2[] = $weight;
+      }
+      if ($weight = (int)variable_get('node_rank_recent', 5)) {
+        // Exponential decay with half-life of 6 months, starting at last indexed node
+        $ranking[] = '%d * POW(2, (GREATEST(n.created, n.changed, c.last_comment_timestamp) - %d) * 6.43e-8)';
+        $arguments2[] = $weight;
+        $arguments2[] = (int)variable_get('node_cron_last', 0);
+        $join2 .= ' INNER JOIN {node} n ON n.nid = i.sid LEFT JOIN {node_comment_statistics} c ON c.nid = i.sid';
+        $stats_join = true;
+      }
+      if (module_exist('comment') && $weight = (int)variable_get('node_rank_comments', 5)) {
+        // Inverse law that maps the highest reply count on the site to 1 and 0 to 0.
+        $scale = variable_get('node_cron_comments_scale', 0.0);
+        $ranking[] = '%d * (2.0 - 2.0 / (1.0 + c.comment_count * %f))';
+        $arguments2[] = $weight;
+        $arguments2[] = $scale;
+        if (!$stats_join) {
+          $join2 .= ' LEFT JOIN {node_comment_statistics} c ON c.nid = i.sid';
+        }
+      }
+      if (module_exist('statistics') && variable_get('statistics_count_content_views', 0) &&
+          $weight = (int)variable_get('node_rank_views', 5)) {
+        // Inverse law that maps the highest view count on the site to 1 and 0 to 0.
+        $scale = variable_get('node_cron_views_scale', 0.0);
+        $ranking[] = '%d * (2.0 - 2.0 / (1.0 + nc.totalcount * %f))';
+        $arguments2[] = $weight;
+        $arguments2[] = $scale;
+        $join2 .= ' LEFT JOIN {node_counter} nc ON nc.nid = i.sid';
+      }
+      $select2 = (count($ranking) ? implode(' + ', $ranking) : 'i.relevance') . ' AS score';
+
+      // Do search
+      $find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. $join1 .' INNER JOIN {users} u ON n.uid = u.uid', $conditions1 . (empty($where1) ? '' : ' AND '. $where1), $arguments1, $select2, $join2, $arguments2);
+
+      // Load results
+      $results = array();
+      foreach ($find as $item) {
+        $node = node_load($item->sid);
+
+        // Get node output (filtered and with module-specific fields).
+        if (node_hook($node, 'view')) {
+          node_invoke($node, 'view', false, false);
+        }
+        else {
+          $node = node_prepare($node, false);
+        }
+        // Allow modules to change $node->body before viewing.
+        node_invoke_nodeapi($node, 'view', false, false);
+
+        // Fetch comments for snippet
+        $node->body .= module_invoke('comment', 'nodeapi', $node, 'update index');
+        // Fetch terms for snippet
+        $node->body .= module_invoke('taxonomy', 'nodeapi', $node, 'update index');
+
+        $extra = node_invoke_nodeapi($node, 'search result');
+        $results[] = array('link' => url('node/'. $item->sid),
+                           'type' => node_get_name($node),
+                           'title' => $node->title,
+                           'user' => theme('username', $node),
+                           'date' => $node->changed,
+                           'node' => $node,
+                           'extra' => $extra,
+                           'snippet' => search_excerpt($keys, $node->body));
+      }
+      return $results;
+  }
+}
+
+/**
+ * Implementation of hook_user().
+ */
+function node_user($op, &$edit, &$user) {
+  if ($op == 'delete') {
+    db_query('UPDATE {node} SET uid = 0 WHERE uid = %d', $user->uid);
+    db_query('UPDATE {node_revisions} SET uid = 0 WHERE uid = %d', $user->uid);
+  }
+}
+
+function theme_node_search_admin($form) {
+  $output = form_render($form['info']);
+
+  $header = array(t('Factor'), t('Weight'));
+  foreach (element_children($form['factors']) as $key) {
+    $row = array();
+    $row[] = $form['factors'][$key]['#title'];
+    unset($form['factors'][$key]['#title']);
+    $row[] = form_render($form['factors'][$key]);
+    $rows[] = $row;
+  }
+  $output .= theme('table', $header, $rows);
+
+  $output .= form_render($form);
+  return $output;
+}
+
+/**
+ * Menu callback; presents general node configuration options.
+ */
+function node_configure() {
+
+  $form['default_nodes_main'] = array(
+    '#type' => 'select', '#title' => t('Number of posts on main page'), '#default_value' => variable_get('default_nodes_main', 10),
+    '#options' =>  drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
+    '#description' => t('The default maximum number of posts to display per page on overview pages such as the main page.')
+  );
+
+  $form['teaser_length'] = array(
+    '#type' => 'select', '#title' => t('Length of trimmed posts'), '#default_value' => variable_get('teaser_length', 600),
+    '#options' => array(0 => t('Unlimited'), 200 => t('200 characters'), 400 => t('400 characters'), 600 => t('600 characters'),
+      800 => t('800 characters'), 1000 => t('1000 characters'), 1200 => t('1200 characters'), 1400 => t('1400 characters'),
+      1600 => t('1600 characters'), 1800 => t('1800 characters'), 2000 => t('2000 characters')),
+    '#description' => t("The maximum number of characters used in the trimmed version of a post.  Drupal will use this setting to determine at which offset long posts should be trimmed.  The trimmed version of a post is typically used as a teaser when displaying the post on the main page, in XML feeds, etc.  To disable teasers, set to 'Unlimited'. Note that this setting will only affect new or updated content and will not affect existing teasers.")
+  );
+
+  $form['node_preview'] = array(
+    '#type' => 'radios', '#title' => t('Preview post'), '#default_value' => variable_get('node_preview', 0),
+    '#options' => array(t('Optional'), t('Required')), '#description' => t('Must users preview posts before submitting?')
+  );
+
+  return system_settings_form('node_configure', $form);
+}
+
+/**
+ * Retrieve the comment mode for the given node ID (none, read, or read/write).
+ */
+function node_comment_mode($nid) {
+  static $comment_mode;
+  if (!isset($comment_mode[$nid])) {
+    $comment_mode[$nid] = db_result(db_query('SELECT comment FROM {node} WHERE nid = %d', $nid));
+  }
+  return $comment_mode[$nid];
+}
+
+/**
+ * Implementation of hook_link().
+ */
+function node_link($type, $node = 0, $main = 0) {
+  $links = array();
+
+  if ($type == 'node') {
+    if (array_key_exists('links', $node)) {
+      $links = $node->links;
+    }
+
+    if ($main == 1 && $node->teaser && $node->readmore) {
+      $links[] = l(t('read more'), "node/$node->nid", array('title' => t('Read the rest of this posting.'), 'class' => 'read-more'));
+    }
+  }
+
+  return $links;
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function node_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'admin/node', 'title' => t('content'),
+      'callback' => 'node_admin_nodes',
+      'access' => user_access('administer nodes'));
+    $items[] = array('path' => 'admin/node/overview', 'title' => t('list'),
+      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
+
+    if (module_exist('search')) {
+      $items[] = array('path' => 'admin/node/search', 'title' => t('search'),
+        'callback' => 'node_admin_search',
+        'access' => user_access('administer nodes'),
+        'type' => MENU_LOCAL_TASK);
+    }
+
+    $items[] = array('path' => 'admin/settings/node', 'title' => t('posts'),
+      'callback' => 'node_configure',
+      'access' => user_access('administer nodes'));
+    $items[] = array('path' => 'admin/settings/content-types', 'title' => t('content types'),
+      'callback' => 'node_types_configure',
+      'access' => user_access('administer nodes'));
+
+    $items[] = array('path' => 'node', 'title' => t('content'),
+      'callback' => 'node_page',
+      'access' => user_access('access content'),
+      'type' => MENU_MODIFIABLE_BY_ADMIN);
+    $items[] = array('path' => 'node/add', 'title' => t('create content'),
+      'callback' => 'node_page',
+      'access' => user_access('access content'),
+      'type' => MENU_ITEM_GROUPING,
+      'weight' => 1);
+    $items[] = array('path' => 'rss.xml', 'title' => t('rss feed'),
+      'callback' => 'node_feed',
+      'access' => user_access('access content'),
+      'type' => MENU_CALLBACK);
+  }
+  else {
+    if (arg(0) == 'node' && is_numeric(arg(1))) {
+      $node = node_load(arg(1));
+      if ($node->nid) {
+        $items[] = array('path' => 'node/'. arg(1), 'title' => t('view'),
+          'callback' => 'node_page',
+          'access' => node_access('view', $node),
+          'type' => MENU_CALLBACK);
+        $items[] = array('path' => 'node/'. arg(1) .'/view', 'title' => t('view'),
+            'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
+        $items[] = array('path' => 'node/'. arg(1) .'/edit', 'title' => t('edit'),
+          'callback' => 'node_page',
+          'access' => node_access('update', $node),
+          'weight' => 1,
+          'type' => MENU_LOCAL_TASK);
+        $items[] = array('path' => 'node/'. arg(1) .'/delete', 'title' => t('delete'),
+          'callback' => 'node_delete_confirm',
+          'access' => node_access('delete', $node),
+          'weight' => 1,
+          'type' => MENU_CALLBACK);
+        $revisions_access = ((user_access('view revisions') || user_access('administer nodes')) && node_access('view', $node) && db_result(db_query('SELECT COUNT(vid) FROM {node_revisions} WHERE nid = %d', arg(1))) > 1);
+        $items[] = array('path' => 'node/'. arg(1) .'/revisions', 'title' => t('revisions'),
+          'callback' => 'node_revisions',
+          'access' => $revisions_access,
+          'weight' => 2,
+          'type' => MENU_LOCAL_TASK);
+      }
+    }
+    else if (arg(0) == 'admin' && arg(1) == 'settings' && arg(2) == 'content-types' && is_string(arg(3))) {
+      $items[] = array('path' => 'admin/settings/content-types/'. arg(3),
+        'title' => t("'%name' content type", array('%name' => node_get_name(arg(3)))),
+        'type' => MENU_CALLBACK);
+    }
+  }
+
+  return $items;
+}
+
+function node_last_changed($nid) {
+  $node = db_fetch_object(db_query('SELECT changed FROM {node} WHERE nid = %d', $nid));
+  return ($node->changed);
+}
+
+/**
+ * List node administration operations that can be performed.
+ */
+function node_operations() {
+  $operations = array(
+    'approve' =>   array(t('Approve the selected posts'), 'UPDATE {node} SET status = 1, moderate = 0 WHERE nid = %d'),
+    'promote' =>   array(t('Promote the selected posts'), 'UPDATE {node} SET status = 1, promote = 1 WHERE nid = %d'),
+    'sticky' =>    array(t('Make the selected posts sticky'), 'UPDATE {node} SET status = 1, sticky = 1 WHERE nid = %d'),
+    'demote' =>    array(t('Demote the selected posts'), 'UPDATE {node} SET promote = 0 WHERE nid = %d'),
+    'unpublish' => array(t('Unpublish the selected posts'), 'UPDATE {node} SET status = 0 WHERE nid = %d'),
+    'delete' =>    array(t('Delete the selected posts'), '')
+  );
+  return $operations;
+}
+
+/**
+ * List node administration filters that can be applied.
+ */
+function node_filters() {
+  // Regular filters
+  $filters['status'] = array('title' => t('status'),
+    'options' => array('status-1'   => t('published'),     'status-0' => t('not published'),
+                       'moderate-1' => t('in moderation'), 'moderate-0' => t('not in moderation'),
+                       'promote-1'  => t('promoted'),      'promote-0' => t('not promoted'),
+                       'sticky-1'   => t('sticky'),        'sticky-0' => t('not sticky')));
+  $filters['type'] = array('title' => t('type'), 'options' => node_get_types());
+  // The taxonomy filter
+  if ($taxonomy = module_invoke('taxonomy', 'form_all', 1)) {
+    $filters['category'] = array('title' => t('category'), 'options' => $taxonomy);
+  }
+
+  return $filters;
+}
+
+/**
+ * Build query for node administration filters based on session.
+ */
+function node_build_filter_query() {
+  $filters = node_filters();
+
+  // Build query
+  $where = $args = array();
+  $join = '';
+  foreach ($_SESSION['node_overview_filter'] as $index => $filter) {
+    list($key, $value) = $filter;
+    switch($key) {
+      case 'status':
+        // Note: no exploitable hole as $key/$value have already been checked when submitted
+        list($key, $value) = explode('-', $value, 2);
+        $where[] = 'n.'. $key .' = %d';
+        break;
+      case 'category':
+        $table = "tn$index";
+        $where[] = "$table.tid = %d";
+        $join .= "INNER JOIN {term_node} $table ON n.nid = $table.nid ";
+        break;
+      case 'type':
+        $where[] = "n.type = '%s'";
+    }
+    $args[] = $value;
+  }
+  $where = count($where) ? 'WHERE '. implode(' AND ', $where) : '';
+
+  return array('where' => $where, 'join' => $join, 'args' => $args);
+}
+
+/**
+ * Return form for node administration filters.
+ */
+function node_filter_form() {
+  $session = &$_SESSION['node_overview_filter'];
+  $session = is_array($session) ? $session : array();
+  $filters = node_filters();
+
+  $i = 0;
+  $form['filters'] = array('#type' => 'fieldset',
+    '#title' => t('Show only items where'),
+    '#theme' => 'node_filters',
+  );
+  foreach ($session as $filter) {
+    list($type, $value) = $filter;
+    if ($type == 'category') {
+      // Load term name from DB rather than search and parse options array.
+      $value = module_invoke('taxonomy', 'get_term', $value);
+      $value = $value->name;
+    }
+    else {
+      $value = $filters[$type]['options'][$value];
+    }
+    $string = ($i++ ? 'and where %a is %b' : '%a is %b');
+    $form['filters']['current'][] = array('#value' => t($string, array('%a' => $filters[$type]['title'] , '%b' => $value)));
+  }
+
+  foreach ($filters as $key => $filter) {
+    $names[$key] = $filter['title'];
+    $form['filters']['status'][$key] = array('#type' => 'select', '#options' => $filter['options']);
+  }
+
+  $form['filters']['filter'] = array('#type' => 'radios', '#options' => $names, '#default_value' => 'status');
+  $form['filters']['buttons']['submit'] = array('#type' => 'submit', '#value' => (count($session) ? t('Refine') : t('Filter')));
+  if (count($session)) {
+    $form['filters']['buttons']['undo'] = array('#type' => 'submit', '#value' => t('Undo'));
+    $form['filters']['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset'));
+  }
+
+  return drupal_get_form('node_filter_form', $form);
+}
+
+/**
+ * Theme node administration filter form.
+ */
+function theme_node_filter_form(&$form) {
+  $output .= '
                          ';
+  $output .= form_render($form['filters']);
+  $output .= '
                          ';
+  $output .= form_render($form);
+  return $output;
+}
+
+/**
+ * Theme node administraton filter selector.
+ */
+function theme_node_filters(&$form) {
+  $output .= '
                            ';
+  if (sizeof($form['current'])) {
+    foreach (element_children($form['current']) as $key) {
+      $output .= '
                          • ' . form_render($form['current'][$key]) . '
                            • ';
+    }
+  }
+
+  $output .= '
                          • ' . (sizeof($form['current']) ? '
                            '. t('and') .' '. t('where') .'
                            ' : '') . '
                            ';
+  foreach (element_children($form['filter']) as $key) {
+    $output .= form_render($form['filter'][$key]);
+  }
+  $output .= '
                            ';
+
+  $output .= '
                            '. t('is') .'
                            ' . '
                            ';
+
+  foreach (element_children($form['status']) as $key) {
+    $output .= form_render($form['status'][$key]);
+  }
+  $output .= '
                            ';
+
+  $output .= '
                            ';
+  $output .= '
                            '. form_render($form['buttons']) .'
                            ';
+  $output .= '

                          ';
+
+  return $output;
+}
+
+/**
+ * Process result from node administration filter form.
+ */
+function node_filter_form_submit() {
+  global $form_values;
+  $op = $_POST['op'];
+  $filters = node_filters();
+  switch ($op) {
+    case t('Filter'):
+    case t('Refine'):
+      if (isset($form_values['filter'])) {
+        $filter = $form_values['filter'];
+
+        // Flatten the options array to accommodate hierarchical/nested options.
+        $flat_options = form_options_flatten($filters[$filter]['options']);
+
+        if (isset($flat_options[$form_values[$filter]])) {
+          $_SESSION['node_overview_filter'][] = array($filter, $form_values[$filter]);
+        }
+      }
+      break;
+    case t('Undo'):
+      array_pop($_SESSION['node_overview_filter']);
+      break;
+    case t('Reset'):
+      $_SESSION['node_overview_filter'] = array();
+      break;
+  }
+}
+
+/**
+ * Generate the content administration overview.
+ */
+function node_admin_nodes_submit($form_id, $edit) {
+  $operations = node_operations();
+  if ($operations[$edit['operation']][1]) {
+    // Flag changes
+    $operation = $operations[$edit['operation']][1];
+    foreach ($edit['nodes'] as $nid => $value) {
+      if ($value) {
+        db_query($operation, $nid);
+      }
+    }
+    cache_clear_all();
+    drupal_set_message(t('The update has been performed.'));
+  }
+}
+
+function node_admin_nodes_validate($form_id, $edit) {
+  $edit['nodes'] = array_diff($edit['nodes'], array(0));
+  if (count($edit['nodes']) == 0) {
+    if ($edit['operation'] == 'delete') {
+      form_set_error('', t('Please select some items to perform the delete operation.'));
+    }
+    else {
+      form_set_error('', t('Please select some items to perform the update on.'));
+    }
+  }
+}
+
+/**
+ * Menu callback: content administration.
+ */
+function node_admin_nodes() {
+  global $form_values;
+  $output = node_filter_form();
+
+  if ($_POST['edit']['operation'] == 'delete' && $_POST['edit']['nodes']) {
+    return node_multiple_delete_confirm();
+  }
+
+  $filter = node_build_filter_query();
+
+  $result = pager_query('SELECT n.*, u.name, u.uid FROM {node} n '. $filter['join'] .' INNER JOIN {users} u ON n.uid = u.uid '. $filter['where'] .' ORDER BY n.changed DESC', 50, 0, NULL, $filter['args']);
+
+  $form['options'] = array('#type' => 'fieldset',
+    '#title' => t('Update options'),
+    '#prefix' => '
                          ',
+    '#suffix' => '
                          ',
+  );
+  $options = array();
+  foreach (node_operations() as $key => $value) {
+    $options[$key] = $value[0];
+  }
+  $form['options']['operation'] = array('#type' => 'select', '#options' => $options,  '#default_value' => 'approve');
+  $form['options']['submit'] = array('#type' => 'submit', '#value' => t('Update'));
+
+  $destination = drupal_get_destination();
+  while ($node = db_fetch_object($result)) {
+    $nodes[$node->nid] = '';
+    $form['title'][$node->nid] = array('#value' => l($node->title, 'node/'. $node->nid) .' '. theme('mark', node_mark($node->nid, $node->changed)));
+    $form['name'][$node->nid] =  array('#value' => node_get_name($node));
+    $form['username'][$node->nid] = array('#value' => theme('username', $node));
+    $form['status'][$node->nid] =  array('#value' =>  ($node->status ? t('published') : t('not published')));
+    $form['operations'][$node->nid] = array('#value' => l(t('edit'), 'node/'. $node->nid .'/edit', array(), $destination));
+  }
+  $form['nodes'] = array('#type' => 'checkboxes', '#options' => $nodes);
+  $form['pager'] = array('#value' => theme('pager', NULL, 50, 0));
+
+  // Call the form first, to allow for the form_values array to be populated.
+  $output .= drupal_get_form('node_admin_nodes', $form);
+
+  return $output;
+}
+
+/**
+ * Theme node administration overview.
+ */
+function theme_node_admin_nodes($form) {
+  // Overview table:
+  $header = array(NULL, t('Title'), t('Type'), t('Author'), t('Status'), t('Operations'));
+
+  $output .= form_render($form['options']);
+  if (isset($form['title']) && is_array($form['title'])) {
+    foreach (element_children($form['title']) as $key) {
+      $row = array();
+      $row[] = form_render($form['nodes'][$key]);
+      $row[] = form_render($form['title'][$key]);
+      $row[] = form_render($form['name'][$key]);
+      $row[] = form_render($form['username'][$key]);
+      $row[] = form_render($form['status'][$key]);
+      $row[] = form_render($form['operations'][$key]);
+      $rows[] = $row;
+    }
+
+  }
+  else  {
+    $rows[] = array(array('data' => t('No posts available.'), 'colspan' => '6'));
+  }
+
+  $output .= theme('table', $header, $rows);
+  if ($form['pager']['#value']) {
+    $output .= form_render($form['pager']);
+  }
+
+  $output .= form_render($form);
+
+  return $output;
+}
+
+function node_multiple_delete_confirm() {
+  $edit = $_POST['edit'];
+
+  $form['nodes'] = array('#prefix' => '
                            ', '#suffix' => '
                          ', '#tree' => TRUE);
+  // array_filter returns only elements with true values
+  foreach (array_filter($edit['nodes']) as $nid => $value) {
+    $title = db_result(db_query('SELECT title FROM {node} WHERE nid = %d', $nid));
+    $form['nodes'][$nid] = array('#type' => 'hidden', '#value' => $nid, '#prefix' => '
                        2. ', '#suffix' => check_plain($title) ."
                          3. \n");
+  }
+  $form['operation'] = array('#type' => 'hidden', '#value' => 'delete');
+
+  return confirm_form('node_multiple_delete_confirm', $form,
+                      t('Are you sure you want to delete these items?'),
+                      'admin/node', t('This action cannot be undone.'),
+                      t('Delete all'), t('Cancel'));
+}
+
+function node_multiple_delete_confirm_submit($form_id, $edit) {
+  if ($edit['confirm']) {
+    foreach ($edit['nodes'] as $nid => $value) {
+      node_delete($nid);
+    }
+    drupal_set_message(t('The items have been deleted.'));
+  }
+  return 'admin/node';
+}
+
+/**
+ * Menu callback; presents each node type configuration page.
+ */
+function node_types_configure($type = NULL) {
+  if (isset($type)) {
+    $node = new stdClass();
+    $node->type = $type;
+    $form['submission'] = array('#type' => 'fieldset', '#title' =>t('Submission form') );
+    $form['submission'][$type . '_help']  = array(
+      '#type' => 'textarea', '#title' => t('Explanation or submission guidelines'), '#default_value' =>  variable_get($type .'_help', ''),
+      '#description' => t('This text will be displayed at the top of the %type submission form. It is useful for helping or instructing your users.', array('%type' => node_get_name($type)))
+    );
+    $form['submission']['minimum_'. $type .'_size'] = array(
+      '#type' => 'select', '#title' => t('Minimum number of words'), '#default_value' => variable_get('minimum_'. $type .'_size', 0), '#options' => drupal_map_assoc(array(0, 10, 25, 50, 75, 100, 125, 150, 175, 200)),
+      '#description' => t('The minimum number of words a %type must be to be considered valid. This can be useful to rule out submissions that do not meet the site\'s standards, such as short test posts.', array('%type' => node_get_name($type)))
+    );
+    $form['workflow'] = array('#type' => 'fieldset', '#title' =>t('Workflow'));
+    $form['type'] = array('#type' => 'value', '#value' => $type);
+
+    $form['array_filter'] = array('#type' => 'value', '#value' => TRUE);
+    return system_settings_form($type .'_node_settings', $form);
+  }
+  else {
+    $header = array(t('Type'), t('Operations'));
+
+    $rows = array();
+    foreach (node_get_types() as $type => $name) {
+      $rows[] = array($name, l(t('configure'), 'admin/settings/content-types/'. $type));
+    }
+
+    return theme('table', $header, $rows);
+  }
+}
+
+/**
+ * Generate an overview table of older revisions of a node.
+ */
+function node_revision_overview($node) {
+  drupal_set_title(t('Revisions for %title', array('%title' => check_plain($node->title))));
+
+  $header = array(t('Revision'), array('data' => t('Operations'), 'colspan' => 2));
+
+  $revisions = node_revision_list($node);
+
+  $rows = array();
+  $revert_permission = FALSE;
+  if ((user_access('revert revisions') || user_access('administer nodes')) && node_access('update', $node)) {
+    $revert_permission = TRUE;
+  }
+  $delete_permission = FALSE;
+  if (user_access('administer nodes')) {
+    $delete_permission = TRUE;
+  }
+  foreach ($revisions as $revision) {
+    $row = array();
+    $operations = array();
+
+    if ($revision->current_vid > 0) {
+      $row[] = array('data' => t('%date by %username', array('%date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid"), '%username' => theme('username', $revision)))
+                               . (($revision->log != '') ? '
                          '. filter_xss($revision->log) .'
                          ' : ''),
+                     'class' => 'revision-current');
+      $operations[] = array('data' => theme('placeholder', t('current revision')), 'class' => 'revision-current', 'colspan' => 2);
+    }
+    else {
+      $row[] = t('%date by %username', array('%date' => l(format_date($revision->timestamp, 'small'), "node/$node->nid/revisions/$revision->vid/view"), '%username' => theme('username', $revision)))
+               . (($revision->log != '') ? '
                          '. filter_xss($revision->log) .'
                          ' : '');
+      if ($revert_permission) {
+        $operations[] = l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert");
+      }
+      if ($delete_permission) {
+        $operations[] = l(t('delete'), "node/$node->nid/revisions/$revision->vid/delete");
+      }
+    }
+    $rows[] = array_merge($row, $operations);
+  }
+  $output .= theme('table', $header, $rows);
+
+  return $output;
+}
+
+/**
+ * Revert to the revision with the specified revision number. A node and nodeapi "update" event is triggered
+ * (via the node_save() call) when a revision is reverted.
+ */
+function node_revision_revert($nid, $revision) {
+  global $user;
+
+  $node = node_load($nid, $revision);
+  if ((user_access('revert revisions') || user_access('administer nodes')) && node_access('update', $node)) {
+    if ($node->vid) {
+      $node->revision = 1;
+      $node->log = t('Copy of the revision from %date.', array('%date' => theme('placeholder', format_date($node->revision_timestamp))));
+      $node->taxonomy = array_keys($node->taxonomy);
+
+      node_save($node);
+
+      drupal_set_message(t('%title has been reverted back to the revision from %revision-date', array('%revision-date' => theme('placeholder', format_date($node->revision_timestamp)), '%title' => theme('placeholder', check_plain($node->title)))));
+      watchdog('content', t('%type: reverted %title revision %revision.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
+    }
+    else {
+      drupal_set_message(t('You tried to revert to an invalid revision.'), 'error');
+    }
+    drupal_goto('node/'. $nid .'/revisions');
+  }
+  drupal_access_denied();
+}
+
+/**
+ * Delete the revision with specified revision number. A "delete revision" nodeapi event is invoked when a
+ * revision is deleted.
+ */
+function node_revision_delete($nid, $revision) {
+  if (user_access('administer nodes')) {
+    $node = node_load($nid);
+    if (node_access('delete', $node)) {
+      // Don't delete the current revision
+      if ($revision != $node->vid) {
+        $node = node_load($nid, $revision);
+
+        db_query("DELETE FROM {node_revisions} WHERE nid = %d AND vid = %d", $nid, $revision);
+        node_invoke_nodeapi($node, 'delete revision');
+        drupal_set_message(t('Deleted %title revision %revision.', array('%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
+        watchdog('content', t('%type: deleted %title revision %revision.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
+      }
+
+      else {
+        drupal_set_message(t('Deletion failed. You tried to delete the current revision.'));
+      }
+      if (db_result(db_query('SELECT COUNT(vid) FROM {node_revisions} WHERE nid = %d', $nid)) > 1) {
+        drupal_goto("node/$nid/revisions");
+      }
+      else {
+        drupal_goto("node/$nid");
+      }
+    }
+  }
+
+  drupal_access_denied();
+}
+
+/**
+ * Return a list of all the existing revision numbers.
+ */
+function node_revision_list($node) {
+  $revisions = array();
+  $result = db_query('SELECT r.vid, r.title, r.log, r.uid, n.vid AS current_vid, r.timestamp, u.name FROM {node_revisions} r LEFT JOIN {node} n ON n.vid = r.vid INNER JOIN {users} u ON u.uid = r.uid WHERE r.nid = %d ORDER BY r.timestamp DESC', $node->nid);
+  while ($revision = db_fetch_object($result)) {
+    $revisions[] = $revision;
+  }
+
+  return $revisions;
+}
+
+function node_admin_search() {
+  $output = search_form(url('admin/node/search'), $_POST['edit']['keys'], 'node') . search_data($_POST['edit']['keys'], 'node');
+  return $output;
+}
+
+/**
+ * Implementation of hook_block().
+ */
+function node_block($op = 'list', $delta = 0) {
+  if ($op == 'list') {
+    $blocks[0]['info'] = t('Syndicate');
+    return $blocks;
+  }
+  else if ($op == 'view') {
+    $block['subject'] = t('Syndicate');
+    $block['content'] = theme('feed_icon', url('rss.xml'));
+
+    return $block;
+  }
+}
+
+/**
+ * A generic function for generating RSS feeds from a set of nodes.
+ *
+ * @param $nodes
+ *   An object as returned by db_query() which contains the nid field.
+ * @param $channel
+ *   An associative array containing title, link, description and other keys.
+ *   The link should be an absolute URL.
+ */
+function node_feed($nodes = 0, $channel = array()) {
+  global $base_url, $locale;
+
+  if (!$nodes) {
+    $nodes = db_query_range(db_rewrite_sql('SELECT n.nid, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 ORDER BY n.created DESC'), 0, variable_get('feed_default_items', 10));
+  }
+
+  $item_length = variable_get('feed_item_length', 'teaser');
+  $namespaces = array('xmlns:dc="http://purl.org/dc/elements/1.1/"');
+
+  while ($node = db_fetch_object($nodes)) {
+    // Load the specified node:
+    $item = node_load($node->nid);
+    $link = url("node/$node->nid", NULL, NULL, 1);
+
+    if ($item_length != 'title') {
+      $teaser = ($item_length == 'teaser') ? TRUE : FALSE;
+
+      // Filter and prepare node teaser
+      if (node_hook($item, 'view')) {
+        node_invoke($item, 'view', $teaser, FALSE);
+      }
+      else {
+        $item = node_prepare($item, $teaser);
+      }
+
+      // Allow modules to change $node->teaser before viewing.
+      node_invoke_nodeapi($item, 'view', $teaser, FALSE);
+    }
+
+    // Prepare the item description
+    switch ($item_length) {
+      case 'fulltext':
+        $item_text = $item->body;
+        break;
+      case 'teaser':
+        $item_text = $item->teaser;
+        if ($item->readmore) {
+          $item_text .= '
                          '. l(t('read more'), 'node/'. $item->nid, NULL, NULL, NULL, TRUE) .'
                          ';
+        }
+        break;
+      case 'title':
+        $item_text = '';
+        break;
+    }
+
+    // Allow modules to add additional item fields
+    $extra = node_invoke_nodeapi($item, 'rss item');
+    $extra = array_merge($extra, array(array('key' => 'pubDate', 'value' =>  date('r', $item->created)), array('key' => 'dc:creator', 'value' => $item->name), array('key' => 'guid', 'value' => $item->nid . ' at ' . $base_url, 'attributes' => array('isPermaLink' => 'false'))));
+    foreach ($extra as $element) {
+      if ($element['namespace']) {
+        $namespaces = array_merge($namespaces, $element['namespace']);
+      }
+    }
+    $items .= format_rss_item($item->title, $link, $item_text, $extra);
+  }
+
+  $channel_defaults = array(
+    'version'     => '2.0',
+    'title'       => variable_get('site_name', 'drupal') .' - '. variable_get('site_slogan', ''),
+    'link'        => $base_url,
+    'description' => variable_get('site_mission', ''),
+    'language'    => $locale
+  );
+  $channel = array_merge($channel_defaults, $channel);
+
+  $output = "\n";
+  $output .= "\n";
+  $output .= format_rss_channel($channel['title'], $channel['link'], $channel['description'], $items, $channel['language']);
+  $output .= "\n";
+
+  drupal_set_header('Content-Type: application/rss+xml; charset=utf-8');
+  print $output;
+}
+
+/**
+ * Prepare node for save and allow modules to make changes.
+ */
+function node_submit($node) {
+  global $user;
+
+  // Convert the node to an object, if necessary.
+  $node = (object)$node;
+
+  // Auto-generate the teaser, but only if it hasn't been set (e.g. by a
+  // module-provided 'teaser' form item).
+  if (!isset($node->teaser)) {
+    $node->teaser = isset($node->body) ? node_teaser($node->body, isset($node->format) ? $node->format : NULL) : '';
+  }
+
+  $access = user_access('administer nodes');
+  if ($access) {
+    // Populate the "authored by" field.
+    if ($account = user_load(array('name' => $node->name))) {
+      $node->uid = $account->uid;
+    }
+    else {
+      $node->uid = 0;
+    }
+
+    $node->created = $node->date ? strtotime($node->date) : NULL;
+  }
+  // Force defaults in case people modify the form:
+  $node_options = variable_get('node_options_'. $node->type, array('status', 'promote'));
+  foreach (array('status', 'moderate', 'promote', 'sticky', 'revision') as $key) {
+    if (!$access || !isset($node->$key)) {
+      $node->$key = in_array($key, $node_options);
+    }
+  }
+
+  // Do node-type-specific validation checks.
+  node_invoke($node, 'submit');
+  node_invoke_nodeapi($node, 'submit');
+
+  $node->validated = TRUE;
+
+  return $node;
+}
+
+/**
+ * Perform validation checks on the given node.
+ */
+function node_validate($node, $form = array()) {
+  // Convert the node to an object, if necessary.
+  $node = (object)$node;
+
+  // Make sure the body has the minimum number of words.
+  // todo use a better word counting algorithm that will work in other languages
+  if (isset($node->body) && count(explode(' ', $node->body)) < variable_get('minimum_'. $node->type .'_size', 0)) {
+    form_set_error('body', t('The body of your %type is too short. You need at least %words words.', array('%words' => variable_get('minimum_'. $node->type .'_size', 0), '%type' => node_get_name($node))));
+  }
+
+  if (isset($node->nid) && (node_last_changed($node->nid) > $_POST['edit']['changed'])) {
+    form_set_error('changed', t('This content has been modified by another user, changes cannot be saved.'));
+  }
+
+  if (user_access('administer nodes')) {
+    // Validate the "authored by" field.
+    if (!empty($node->name) && !($account = user_load(array('name' => $node->name)))) {
+      // The use of empty() is mandatory in the context of usernames
+      // as the empty string denotes the anonymous user.  In case we
+      // are dealing with an anonymous user we set the user ID to 0.
+      form_set_error('name', t('The username %name does not exist.', array ('%name' => theme('placeholder', $node->name))));
+    }
+
+    // Validate the "authored on" field. As of PHP 5.1.0, strtotime returns FALSE instead of -1 upon failure.
+    if (!empty($node->date) && strtotime($node->date) <= 0) {
+      form_set_error('date', t('You have to specify a valid date.'));
+    }
+  }
+
+  // Do node-type-specific validation checks.
+  node_invoke($node, 'validate', $form);
+  node_invoke_nodeapi($node, 'validate', $form);
+}
+
+function node_form_validate($form_id, $form_values, $form) {
+  node_validate($form_values, $form);
+}
+
+function node_object_prepare(&$node) {
+  if (user_access('administer nodes')) {
+    // Set up default values, if required.
+    if (!isset($node->created)) {
+      $node->created = time();
+    }
+
+    if (!isset($node->date)) {
+      $node->date = format_date($node->created, 'custom', 'Y-m-d H:i:s O');
+    }
+  }
+  node_invoke($node, 'prepare');
+  node_invoke_nodeapi($node, 'prepare');
+}
+
+/**
+ * Generate the node editing form.
+ */
+function node_form($node) {
+  $node = (object)$node;
+  $form = node_form_array($node);
+  return drupal_get_form($node->type .'_node_form', $form, 'node_form');
+}
+
+/**
+* Generate the node editing form array.
+*/
+function node_form_array($node) {
+  node_object_prepare($node);
+
+  // Set the id of the top-level form tag
+  $form['#id'] = 'node-form';
+
+  /**
+   * Basic node information.
+   * These elements are just values so they are not even sent to the client.
+   */
+  foreach (array('nid', 'vid', 'uid', 'created', 'type') as $key) {
+    $form[$key] = array('#type' => 'value', '#value' => $node->$key);
+  }
+
+  // Changed must be sent to the client, for later overwrite error checking.
+  $form['changed'] = array('#type' => 'hidden', '#value' => $node->changed);
+
+  // Get the node-specific bits.
+  $form = array_merge_recursive($form, node_invoke($node, 'form'));
+  if (!isset($form['title']['#weight'])) {
+    $form['title']['#weight'] = -5;
+  }
+
+  $node_options = variable_get('node_options_'. $node->type, array('status', 'promote'));
+  // If this is a new node, fill in the default values.
+  if (!isset($node->nid)) {
+    foreach (array('status', 'moderate', 'promote', 'sticky', 'revision') as $key) {
+      $node->$key = in_array($key, $node_options);
+    }
+    global $user;
+    $node->uid = $user->uid;
+  }
+  else {
+    // Nodes being edited should always be preset with the default revision setting.
+    $node->revision = in_array('revision', $node_options);
+  }
+  $form['#node'] = $node;
+
+  if (user_access('administer nodes')) {
+    // Node author information
+    $form['author'] = array('#type' => 'fieldset', '#title' => t('Authoring information'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 20);
+    $form['author']['name'] = array('#type' => 'textfield', '#title' => t('Authored by'), '#maxlength' => 60, '#autocomplete_path' => 'user/autocomplete', '#default_value' => $node->name ? $node->name : '', '#weight' => -1, '#description' => t('Leave blank for %anonymous.', array('%anonymous' => theme('placeholder', variable_get('anonymous', 'Anonymous')))));
+    $form['author']['date'] = array('#type' => 'textfield', '#title' => t('Authored on'), '#maxlength' => 25, '#description' => t('Format: %time. Leave blank to use the time of form submission.', array('%time' => $node->date)));
+
+    if (isset($node->nid)) {
+      $form['author']['date']['#default_value'] = $node->date;
+    }
+
+    // Node options for administrators
+    $form['options'] = array('#type' => 'fieldset', '#title' => t('Publishing options'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => 25);
+    $form['options']['status']   = array('#type' => 'checkbox', '#title' => t('Published'), '#default_value' => $node->status);
+    $form['options']['moderate'] = array('#type' => 'checkbox', '#title' => t('In moderation queue'), '#default_value' => $node->moderate);
+    $form['options']['promote']  = array('#type' => 'checkbox', '#title' => t('Promoted to front page'), '#default_value' => $node->promote);
+    $form['options']['sticky']   = array('#type' => 'checkbox', '#title' => t('Sticky at top of lists'), '#default_value' => $node->sticky);
+    $form['options']['revision'] = array('#type' => 'checkbox', '#title' => t('Create new revision'), '#default_value' => $node->revision);
+  }
+  else {
+    // Put all of these through as values if the user doesn't have access to them.
+    foreach (array('uid', 'created') as $key) {
+      $form[$key] = array('#type' => 'value', '#value' => $node->$key);
+    }
+  }
+
+  // Add the buttons.
+  $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 40);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'), '#weight' => 45);
+  if ($node->nid && node_access('delete', $node)) {
+    $form['delete'] = array('#type' => 'button', '#value' => t('Delete'), '#weight' => 50);
+  }
+
+  $form['#after_build'] = array('node_form_add_preview');
+
+  return $form;
+}
+
+function node_form_add_preview($form) {
+  global $form_values;
+
+  $op = isset($_POST['op']) ? $_POST['op'] : '';
+  if ($op == t('Preview')) {
+    drupal_validate_form($form['form_id']['#value'], $form);
+    if (!form_get_errors()) {
+      // We pass the global $form_values here to preserve changes made during form validation
+      $form['node_preview'] = array('#value' => node_preview((object)$form_values), '#weight' => -100);
+    }
+  }
+  if (variable_get('node_preview', 0) && (form_get_errors() || $op != t('Preview'))) {
+    unset($form['submit']);
+  }
+  return $form;
+}
+
+function theme_node_form($form) {
+  $output = "\n
                          \n";
+  if (isset($form['node_preview'])) {
+    $output .= form_render($form['node_preview']);
+  }
+
+  // Admin form fields and submit buttons must be rendered first, because
+  // they need to go to the bottom of the form, and so should not be part of
+  // the catch-all call to form_render().
+  $admin = '';
+  if (isset($form['author'])) {
+    $admin .= "    
                          \n";
+    $admin .= form_render($form['author']);
+    $admin .= "    
                          \n";
+  }
+  if (isset($form['options'])) {
+    $admin .= "    
                          \n";
+    $admin .= form_render($form['options']);
+    $admin .= "    
                          \n";
+  }
+  $buttons = form_render($form['preview']);
+  $buttons .= form_render($form['submit']);
+  $buttons .= isset($form['delete']) ? form_render($form['delete']) : '';
+
+  // Everything else gets rendered here, and is displayed before the admin form
+  // field and the submit buttons.
+  $output .= "  
                          \n";
+  $output .= form_render($form);
+  $output .= "  
                          \n";
+
+  if (!empty($admin)) {
+    $output .= "  
                          \n";
+    $output .= $admin;
+    $output .= "  
                          \n";
+  }
+  $output .= $buttons;
+  $output .= "
                          \n";
+
+  return $output;
+}
+
+/**
+ * Present a node submission form or a set of links to such forms.
+ */
+function node_add($type) {
+  global $user;
+
+  // If a node type has been specified, validate its existence.
+  if (array_key_exists($type, node_get_types()) && node_access('create', $type)) {
+    // Initialize settings:
+    $node = array('uid' => $user->uid, 'name' => $user->name, 'type' => $type);
+
+    $output = node_form($node);
+    drupal_set_title(t('Submit %name', array('%name' => node_get_name($node))));
+  }
+  else {
+    // If no (valid) node type has been provided, display a node type overview.
+    foreach (node_get_types() as $type => $name) {
+      if (node_access('create', $type)) {
+        $out = '
                          '. l($name, "node/add/$type", array('title' => t('Add a new %s.', array('%s' => $name)))) .'
                          ';
+        $out .= '
                          '. implode("\n", module_invoke_all('help', 'node/add#'. $type)) .'
                          ';
+        $item[$name] = $out;
+      }
+    }
+
+    if (isset($item)) {
+      uksort($item, 'strnatcasecmp');
+      $output = t('Choose the appropriate item from the list:') .'
                          '. implode('', $item) .'
                          ';
+    }
+    else {
+      $output = t('You are not allowed to create content.');
+    }
+  }
+
+  return $output;
+}
+
+/**
+ * Generate a node preview.
+ */
+function node_preview($node) {
+  if (node_access('create', $node) || node_access('update', $node)) {
+    // Load the user's name when needed:
+    if (isset($node->name)) {
+      // The use of isset() is mandatory in the context of user IDs, because
+      // user ID 0 denotes the anonymous user.
+      if ($user = user_load(array('name' => $node->name))) {
+        $node->uid = $user->uid;
+      }
+      else {
+        $node->uid = 0; // anonymous user
+      }
+    }
+    else if ($node->uid) {
+      $user = user_load(array('uid' => $node->uid));
+      $node->name = $user->name;
+    }
+
+    // Set the timestamps when needed:
+    if ($node->date) {
+      $node->created = strtotime($node->date);
+    }
+    $node->changed = time();
+
+    // Extract a teaser, if it hasn't been set (e.g. by a module-provided
+    // 'teaser' form item).
+    if (!isset($node->teaser)) {
+      $node->teaser = node_teaser($node->body, $node->format);
+    }
+
+    // Display a preview of the node:
+    // Previewing alters $node so it needs to be cloned.
+    if (!form_get_errors()) {
+      $cloned_node = drupal_clone($node);
+      $cloned_node->in_preview = TRUE;
+      $output = theme('node_preview', $cloned_node);
+    }
+    drupal_set_title(t('Preview'));
+    drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('create content'), 'node/add'), l(t('Submit %name', array('%name' => node_get_name($node))), 'node/add/'. $node->type)));
+
+    return $output;
+  }
+}
+
+/**
+ * Display a node preview for display during node creation and editing.
+ *
+ * @param $node
+ *   The node object which is being previewed.
+ */
+function theme_node_preview($node) {
+  $output = '
                          ';
+  if ($node->teaser && $node->teaser != $node->body) {
+    drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.'));
+    $output .= '
                          '. t('Preview trimmed version') .'
                          ';
+    $output .= node_view(drupal_clone($node), 1, FALSE, 0);
+    $output .= '
                          '. t('Preview full version') .'
                          ';
+    $output .= node_view($node, 0, FALSE, 0);
+  }
+  else {
+    $output .= node_view($node, 0, FALSE, 0);
+  }
+  $output .= "
                          \n";
+
+  return $output;
+}
+
+function node_form_submit($form_id, $edit) {
+  global $user;
+
+  // Fix up the node when required:
+  $node = node_submit($edit);
+
+  // Prepare the node's body:
+  if ($node->nid) {
+    // Check whether the current user has the proper access rights to
+    // perform this operation:
+    if (node_access('update', $node)) {
+      node_save($node);
+      watchdog('content', t('%type: updated %title.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title))), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid));
+      drupal_set_message(t('The %post was updated.', array ('%post' => node_get_name($node))));
+    }
+  }
+  else {
+    // Check whether the current user has the proper access rights to
+    // perform this operation:
+    if (node_access('create', $node)) {
+      node_save($node);
+      watchdog('content', t('%type: added %title.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title))), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid"));
+      drupal_set_message(t('Your %post was created.', array ('%post' => node_get_name($node))));
+    }
+  }
+  if ($node->nid) {
+    if (node_access('view', $node)) {
+      return 'node/'. $node->nid;
+    }
+    else {
+      return '';
+    }
+  }
+  // it is very unlikely we get here
+  return FALSE;
+}
+
+/**
+ * Menu callback -- ask for confirmation of node deletion
+ */
+function node_delete_confirm() {
+  $edit = $_POST['edit'];
+  $edit['nid'] = $edit['nid'] ? $edit['nid'] : arg(1);
+  $node = node_load($edit['nid']);
+
+  if (node_access('delete', $node)) {
+    $form['nid'] = array('#type' => 'value', '#value' => $node->nid);
+    $output = confirm_form('node_delete_confirm', $form,
+                   t('Are you sure you want to delete %title?', array('%title' => theme('placeholder', $node->title))),
+                   $_GET['destination'] ? $_GET['destination'] : 'node/'. $node->nid, t('This action cannot be undone.'),
+                   t('Delete'), t('Cancel')  );
+  }
+
+  return $output;
+}
+
+/**
+ * Execute node deletion
+ */
+function node_delete_confirm_submit($form_id, $form_values) {
+  if ($form_values['confirm']) {
+    node_delete($form_values['nid']);
+  }
+
+  return '';
+}
+
+/**
+ * Delete a node.
+ */
+function node_delete($nid) {
+
+  $node = node_load($nid);
+
+  if (node_access('delete', $node)) {
+    db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
+    db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
+
+    // Call the node-specific callback (if any):
+    node_invoke($node, 'delete');
+    node_invoke_nodeapi($node, 'delete');
+
+    // Clear the cache so an anonymous poster can see the node being deleted.
+    cache_clear_all();
+
+    // Remove this node from the search index if needed.
+    if (function_exists('search_wipe')) {
+      search_wipe($node->nid, 'node');
+    }
+    drupal_set_message(t('%title has been deleted.', array('%title' => theme('placeholder', $node->title))));
+    watchdog('content', t('%type: deleted %title.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title))));
+  }
+}
+
+/**
+ * Menu callback for revisions related activities.
+ */
+function node_revisions() {
+  if (is_numeric(arg(1)) && arg(2) == 'revisions') {
+    $op = arg(4) ? arg(4) : 'overview';
+    switch ($op) {
+      case 'overview':
+        $node = node_load(arg(1));
+        if ((user_access('view revisions') || user_access('administer nodes')) && node_access('view', $node)) {
+          return node_revision_overview($node);
+        }
+        drupal_access_denied();
+        return;
+      case 'view':
+        if (is_numeric(arg(3))) {
+          $node = node_load(arg(1), arg(3));
+          if ($node->nid) {
+            if ((user_access('view revisions') || user_access('administer nodes')) && node_access('view', $node)) {
+              drupal_set_title(t('Revision of %title from %date', array('%title' => theme('placeholder', $node->title), '%date' => format_date($node->revision_timestamp))));
+              return node_show($node, arg(2));
+            }
+            drupal_access_denied();
+            return;
+          }
+        }
+        break;
+      case 'revert':
+        node_revision_revert(arg(1), arg(3));
+        break;
+      case 'delete':
+        node_revision_delete(arg(1), arg(3));
+        break;
+    }
+  }
+  drupal_not_found();
+}
+
+/**
+ * Generate a listing of promoted nodes.
+ */
+function node_page_default() {
+  $result = pager_query(db_rewrite_sql('SELECT n.nid, n.sticky, n.created FROM {node} n WHERE n.promote = 1 AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC'), variable_get('default_nodes_main', 10));
+
+  if (db_num_rows($result)) {
+    drupal_add_link(array('rel' => 'alternate',
+                          'type' => 'application/rss+xml',
+                          'title' => t('RSS'),
+                          'href' => url('rss.xml', NULL, NULL, TRUE)));
+
+    $output = '';
+    while ($node = db_fetch_object($result)) {
+      $output .= node_view(node_load($node->nid), 1);
+    }
+    $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
+  }
+  else {
+    $output = t('
+      
                          Welcome to your new PlanetLab website!
                          
+      
                          Please follow these steps to set up and start using your website:
                          
+      
                            
+        
                          1. 
+          Login
+          To begin, login using a PlanetLab administrative account (e.g., %plc_root_user). This account will have full administration rights and will allow you to configure both the PlanetLab and Drupal aspects of the website.
+        
                            2. 
+        
                          2. 
+          Configure your website
+          Once logged in, visit the Drupal administration section, where you can customize and configure all Drupal aspects of the website. Visit the PlanetLab administration section to configure your PlanetLab installation.
+        
                            3. 
+        
                          3. 
+          Enable additional functionality
+          Next, visit the module list and enable features which suit your specific needs. You can find additional modules in the Drupal modules download section.
+        
                            4. 
+        
                          4. 
+          Customize your website design
+          To change the "look and feel" of your website, visit the themes section. You may choose from one of the included themes or download additional themes from the Drupal themes download section.
+        
                            5. 
+        
                          5. 
+          Start posting content
+          Finally, you can create content for your website. This message will disappear once you have published your first post.
+        
                            6. 
+      
                          
+      
                          For more information about administering the PlanetLab portions of the website, please refer to the MyPLC documentation.
                          
+      
                          For more information about Drupal, please refer to the Help section, or the online Drupal handbooks. You may also post at the Drupal forum, or view the wide range of other support options available.
                          ',
+      array('%drupal' => 'http://drupal.org/', '%register' => url('user/register'), '%admin' => url('admin'), '%config' => url('admin/settings'), '%modules' => url('admin/modules'), '%download_modules' => 'http://drupal.org/project/modules', '%themes' => url('admin/themes'), '%download_themes' => 'http://drupal.org/project/themes', '%content' => url('node/add'), '%help' => url('admin/help'), '%handbook' => 'http://drupal.org/handbooks', '%forum' => 'http://drupal.org/forum', '%support' => 'http://drupal.org/support', '%plc_root_user' => PLC_ROOT_USER, '%db_adm' => '/db/adm/index.php', '%myplc' => '/doc/myplc/myplc.php')
+    );
+    $output = '
                          '. $output .'
                          ';
+  }
+
+  return $output;
+}
+
+/**
+ * Menu callback; dispatches control to the appropriate operation handler.
+ */
+function node_page() {
+  $op = arg(1);
+
+  if (is_numeric($op)) {
+    $op = (arg(2) && !is_numeric(arg(2))) ? arg(2) : 'view';
+  }
+
+  switch ($op) {
+    case 'view':
+      if (is_numeric(arg(1))) {
+        $node = node_load(arg(1));
+        if ($node->nid) {
+          drupal_set_title(check_plain($node->title));
+          return node_show($node, arg(2));
+        }
+        else if (db_result(db_query('SELECT nid FROM {node} WHERE nid = %d', arg(1)))) {
+          drupal_access_denied();
+        }
+        else {
+          drupal_not_found();
+        }
+      }
+      break;
+    case 'add':
+      return node_add(arg(2));
+      break;
+    case 'edit':
+      if ($_POST['op'] == t('Delete')) {
+        // Note: we redirect from node/uid/edit to node/uid/delete to make the tabs disappear.
+        if ($_REQUEST['destination']) {
+          $destination = drupal_get_destination();
+          unset($_REQUEST['destination']);
+        }
+        drupal_goto('node/'. arg(1) .'/delete', $destination);
+      }
+
+      if (is_numeric(arg(1))) {
+        $node = node_load(arg(1));
+        if ($node->nid) {
+          drupal_set_title(check_plain($node->title));
+          return node_form($node);
+        }
+        else if (db_result(db_query('SELECT nid FROM {node} WHERE nid = %d', arg(1)))) {
+          drupal_access_denied();
+        }
+        else {
+          drupal_not_found();
+        }
+      }
+      break;
+    default:
+      drupal_set_title('');
+      return node_page_default();
+  }
+}
+
+/**
+ * shutdown function to make sure we always mark the last node processed.
+ */
+function node_update_shutdown() {
+  global $last_change, $last_nid;
+
+  if ($last_change && $last_nid) {
+    variable_set('node_cron_last', $last_change);
+    variable_set('node_cron_last_nid', $last_nid);
+  }
+}
+
+/**
+ * Implementation of hook_update_index().
+ */
+function node_update_index() {
+  global $last_change, $last_nid;
+
+  register_shutdown_function('node_update_shutdown');
+
+  $last = variable_get('node_cron_last', 0);
+  $last_nid = variable_get('node_cron_last_nid', 0);
+  $limit = (int)variable_get('search_cron_limit', 100);
+
+  // Store the maximum possible comments per thread (used for ranking by reply count)
+  variable_set('node_cron_comments_scale', 1.0 / max(1, db_result(db_query('SELECT MAX(comment_count) FROM {node_comment_statistics}'))));
+  variable_set('node_cron_views_scale', 1.0 / max(1, db_result(db_query('SELECT MAX(totalcount) FROM {node_counter}'))));
+
+  $result = db_query_range('SELECT GREATEST(c.last_comment_timestamp, n.changed) as last_change, n.nid FROM {node} n LEFT JOIN {node_comment_statistics} c ON n.nid = c.nid WHERE n.status = 1 AND ((GREATEST(n.changed, c.last_comment_timestamp) = %d AND n.nid > %d) OR (n.changed > %d OR c.last_comment_timestamp > %d)) ORDER BY GREATEST(n.changed, c.last_comment_timestamp) ASC, n.nid ASC', $last, $last_nid, $last, $last, $last, 0, $limit);
+
+  while ($node = db_fetch_object($result)) {
+    $last_change = $node->last_change;
+    $last_nid = $node->nid;
+    $node = node_load($node->nid);
+
+    // Get node output (filtered and with module-specific fields).
+    if (node_hook($node, 'view')) {
+      node_invoke($node, 'view', false, false);
+    }
+    else {
+      $node = node_prepare($node, false);
+    }
+    // Allow modules to change $node->body before viewing.
+    node_invoke_nodeapi($node, 'view', false, false);
+
+    $text = '
                          '. check_plain($node->title) .'
                          '. $node->body;
+
+    // Fetch extra data normally not visible
+    $extra = node_invoke_nodeapi($node, 'update index');
+    foreach ($extra as $t) {
+      $text .= $t;
+    }
+
+    // Update index
+    search_index($node->nid, 'node', $text);
+  }
+}
+
+/**
+ * Implementation of hook_form_alter().
+ */
+function node_form_alter($form_id, &$form) {
+  // Node publishing options
+  if (isset($form['type']) && $form['type']['#value'] .'_node_settings' == $form_id) {
+    $form['workflow']['node_options_'. $form['type']['#value']] = array('#type' => 'checkboxes',
+      '#title' => t('Default options'),
+      '#default_value' => variable_get('node_options_'. $form['type']['#value'], array('status', 'promote')),
+      '#options' => array(
+        'status' => t('Published'),
+        'moderate' => t('In moderation queue'),
+        'promote' => t('Promoted to front page'),
+        'sticky' => t('Sticky at top of lists'),
+        'revision' => t('Create new revision'),
+      ),
+      '#description' => t('Users with the administer nodes permission will be able to override these options.'),
+    );
+  }
+
+  // Advanced node search form
+  elseif ($form_id == 'search_form' && arg(1) == 'node') {
+    // Keyword boxes:
+    $form['advanced'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Advanced search'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+      '#attributes' => array('class' => 'search-advanced'),
+    );
+    $form['advanced']['keywords'] = array(
+      '#prefix' => '
                          ',
+      '#suffix' => '
                          ',
+    );
+    $form['advanced']['keywords']['or'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Containing any of the words'),
+      '#size' => 30,
+      '#maxlength' => 255,
+    );
+    $form['advanced']['keywords']['phrase'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Containing the phrase'),
+      '#size' => 30,
+      '#maxlength' => 255,
+    );
+    $form['advanced']['keywords']['negative'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Containing none of the words'),
+      '#size' => 30,
+      '#maxlength' => 255,
+    );
+
+    // Taxonomy box:
+    if ($taxonomy = module_invoke('taxonomy', 'form_all', 1)) {
+      $form['advanced']['category'] = array(
+        '#type' => 'select',
+        '#title' => t('Only in the category(s)'),
+        '#prefix' => '
                          ',
+        '#size' => 10,
+        '#suffix' => '
                          ',
+        '#options' => $taxonomy,
+        '#multiple' => TRUE,
+      );
+    }
+
+    // Node types:
+    $types = node_get_types();
+    $form['advanced']['type'] = array(
+      '#type' => 'checkboxes',
+      '#title' => t('Only of the type(s)'),
+      '#prefix' => '
                          ',
+      '#suffix' => '
                          ',
+      '#options' => $types,
+    );
+    $form['advanced']['submit'] = array(
+      '#type' => 'submit',
+      '#value' => t('Advanced search'),
+      '#prefix' => '
                          ',
+      '#suffix' => '

                          ',
+    );
+
+    $form['#validate']['node_search_validate'] = array();
+  }
+}
+
+/**
+ * Form API callback for the search form. Registered in node_form_alter().
+ */
+function node_search_validate($form_id, $form_values, $form) {
+  // Initialise using any existing basic search keywords.
+  $keys = $form_values['processed_keys'];
+
+  // Insert extra restrictions into the search keywords string.
+  if (isset($form_values['type']) && is_array($form_values['type'])) {
+    // Retrieve selected types - Forms API sets the value of unselected checkboxes to 0.
+    $form_values['type'] = array_filter($form_values['type']);
+    if (count($form_values['type'])) {
+      $keys = search_query_insert($keys, 'type', implode(',', array_keys($form_values['type'])));
+    }
+  }
+
+  if (isset($form_values['category']) && is_array($form_values['category'])) {
+    $keys = search_query_insert($keys, 'category', implode(',', $form_values['category']));
+  }
+  if ($form_values['or'] != '') {
+    if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' '. $form_values['or'], $matches)) {
+      $keys .= ' '. implode(' OR ', $matches[1]);
+    }
+  }
+  if ($form_values['negative'] != '') {
+    if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' '. $form_values['negative'], $matches)) {
+      $keys .= ' -'. implode(' -', $matches[1]);
+    }
+  }
+  if ($form_values['phrase'] != '') {
+    $keys .= ' "'. str_replace('"', ' ', $form_values['phrase']) .'"';
+  }
+  if (!empty($keys)) {
+    form_set_value($form['basic']['inline']['processed_keys'], trim($keys));
+  }
+}
+
+/**
+ * @defgroup node_access Node access rights
+ * @{
+ * The node access system determines who can do what to which nodes.
+ *
+ * In determining access rights for a node, node_access() first checks
+ * whether the user has the "administer nodes" permission. Such users have
+ * unrestricted access to all nodes. Then the node module's hook_access()
+ * is called, and a TRUE or FALSE return value will grant or deny access.
+ * This allows, for example, the blog module to always grant access to the
+ * blog author, and for the book module to always deny editing access to
+ * PHP pages.
+ *
+ * If node module does not intervene (returns NULL), then the
+ * node_access table is used to determine access. All node access
+ * modules are queried using hook_node_grants() to assemble a list of
+ * "grant IDs" for the user. This list is compared against the table.
+ * If any row contains the node ID in question (or 0, which stands for "all
+ * nodes"), one of the grant IDs returned, and a value of TRUE for the
+ * operation in question, then access is granted. Note that this table is a
+ * list of grants; any matching row is sufficient to grant access to the
+ * node.
+ *
+ * In node listings, the process above is followed except that
+ * hook_access() is not called on each node for performance reasons and for
+ * proper functioning of the pager system. When adding a node listing to your
+ * module, be sure to use db_rewrite_sql() to add
+ * the appropriate clauses to your query for access checks.
+ *
+ * To see how to write a node access module of your own, see
+ * node_access_example.module.
+ */
+
+/**
+ * Determine whether the current user may perform the given operation on the
+ * specified node.
+ *
+ * @param $op
+ *   The operation to be performed on the node. Possible values are:
+ *   - "view"
+ *   - "update"
+ *   - "delete"
+ *   - "create"
+ * @param $node
+ *   The node object (or node array) on which the operation is to be performed,
+ *   or node type (e.g. 'forum') for "create" operation.
+ * @param $uid
+ *   The user ID on which the operation is to be performed.
+ * @return
+ *   TRUE if the operation may be performed.
+ */
+function node_access($op, $node = NULL, $uid = NULL) {
+  // Convert the node to an object if necessary:
+  if ($op != 'create') {
+    $node = (object)$node;
+  }
+  // If the node is in a restricted format, disallow editing.
+  if ($op == 'update' && !filter_access($node->format)) {
+    return FALSE;
+  }
+
+  if (user_access('administer nodes')) {
+    return TRUE;
+  }
+
+  if (!user_access('access content')) {
+    return FALSE;
+  }
+
+  // Can't use node_invoke(), because the access hook takes the $op parameter
+  // before the $node parameter.
+  $access = module_invoke(node_get_base($node), 'access', $op, $node);
+  if (!is_null($access)) {
+    return $access;
+  }
+
+  // If the module did not override the access rights, use those set in the
+  // node_access table.
+  if ($op != 'create' && $node->nid && $node->status) {
+    $grants = array();
+    foreach (node_access_grants($op, $uid) as $realm => $gids) {
+      foreach ($gids as $gid) {
+        $grants[] = "(gid = $gid AND realm = '$realm')";
+      }
+    }
+
+    $grants_sql = '';
+    if (count($grants)) {
+      $grants_sql = 'AND ('. implode(' OR ', $grants) .')';
+    }
+
+    $sql = "SELECT COUNT(*) FROM {node_access} WHERE (nid = 0 OR nid = %d) $grants_sql AND grant_$op >= 1";
+    $result = db_query($sql, $node->nid);
+    return (db_result($result));
+  }
+  return FALSE;
+}
+
+/**
+ * Generate an SQL join clause for use in fetching a node listing.
+ *
+ * @param $node_alias
+ *   If the node table has been given an SQL alias other than the default
+ *   "n", that must be passed here.
+ * @param $node_access_alias
+ *   If the node_access table has been given an SQL alias other than the default
+ *   "na", that must be passed here.
+ * @return
+ *   An SQL join clause.
+ */
+function _node_access_join_sql($node_alias = 'n', $node_access_alias = 'na') {
+  if (user_access('administer nodes')) {
+    return '';
+  }
+
+  return 'INNER JOIN {node_access} '. $node_access_alias .' ON '. $node_access_alias .'.nid = '. $node_alias .'.nid';
+}
+
+/**
+ * Generate an SQL where clause for use in fetching a node listing.
+ *
+ * @param $op
+ *   The operation that must be allowed to return a node.
+ * @param $node_access_alias
+ *   If the node_access table has been given an SQL alias other than the default
+ *   "na", that must be passed here.
+ * @return
+ *   An SQL where clause.
+ */
+function _node_access_where_sql($op = 'view', $node_access_alias = 'na', $uid = NULL) {
+  if (user_access('administer nodes')) {
+    return;
+  }
+
+  $grants = array();
+  foreach (node_access_grants($op, $uid) as $realm => $gids) {
+    foreach ($gids as $gid) {
+      $grants[] = "($node_access_alias.gid = $gid AND $node_access_alias.realm = '$realm')";
+    }
+  }
+
+  $grants_sql = '';
+  if (count($grants)) {
+    $grants_sql = 'AND ('. implode(' OR ', $grants) .')';
+  }
+
+  $sql = "$node_access_alias.grant_$op >= 1 $grants_sql";
+  return $sql;
+}
+
+/**
+ * Fetch an array of permission IDs granted to the given user ID.
+ *
+ * The implementation here provides only the universal "all" grant. A node
+ * access module should implement hook_node_grants() to provide a grant
+ * list for the user.
+ *
+ * @param $op
+ *   The operation that the user is trying to perform.
+ * @param $uid
+ *   The user ID performing the operation. If omitted, the current user is used.
+ * @return
+ *   An associative array in which the keys are realms, and the values are
+ *   arrays of grants for those realms.
+ */
+function node_access_grants($op, $uid = NULL) {
+  global $user;
+
+  if (isset($uid)) {
+    $user_object = user_load(array('uid' => $uid));
+  }
+  else {
+    $user_object = $user;
+  }
+
+  return array_merge(array('all' => array(0)), module_invoke_all('node_grants', $user_object, $op));
+}
+
+/**
+ * Determine whether the user has a global viewing grant for all nodes.
+ */
+function node_access_view_all_nodes() {
+  static $access;
+
+  if (!isset($access)) {
+    $grants = array();
+    foreach (node_access_grants('view') as $realm => $gids) {
+      foreach ($gids as $gid) {
+        $grants[] = "(gid = $gid AND realm = '$realm')";
+      }
+    }
+
+    $grants_sql = '';
+    if (count($grants)) {
+      $grants_sql = 'AND ('. implode(' OR ', $grants) .')';
+    }
+
+    $sql = "SELECT COUNT(*) FROM {node_access} WHERE nid = 0 $grants_sql AND grant_view >= 1";
+    $result = db_query($sql);
+    $access = db_result($result);
+  }
+
+  return $access;
+}
+
+/**
+ * Implementation of hook_db_rewrite_sql
+ */
+function node_db_rewrite_sql($query, $primary_table, $primary_field) {
+  if ($primary_field == 'nid' && !node_access_view_all_nodes()) {
+    $return['join'] = _node_access_join_sql($primary_table);
+    $return['where'] = _node_access_where_sql();
+    $return['distinct'] = 1;
+    return $return;
+  }
+}
+
+/**
+ * @} End of "defgroup node_access".
+ */
+
+
diff --git a/modules/page.module b/modules/page.module
new file mode 100644
index 0000000..361ce9f
--- /dev/null
+++ b/modules/page.module
@@ -0,0 +1,100 @@
+'. t('The page module allows users to create static pages, which are the most basic type of content.  Pages are commonly collected in books via the book module.  Users should create a page if the information on the page is static.  An example would be an "about" page. ') .'
                          ';
+      $output .= '
                          '. t('When a  page is created, a user can set authoring information, configure publishing options, whether readers will be able to post comments.  They can also select the content type of the page (e.g., full HTML, filtered HTML). ') .'
                          ';
+      $output .= '
                          '. t('As an administrator, you can set the publishing default for a page (in its workflow): you can specify whether a page is by default published, sent to moderation, promoted to the front page, sticky at the top of lists, and whether revisions are enabled by default.    You can set the permissions that different user roles have to view, create, and edit pages.') .'
                          ';
+      $output .= '
                          '. t('If the location module is enabled, then location specific information can be added.  If the trackback module is enabled trackbacks can be configured.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%admin-help-node' => url('admin/help/node'), '%admin-help-page' => url('admin/help/page'), '%admin-help-story' => url('admin/help/story'), '%node-add-page' => url('node/add/page'), '%admin-settings-content-types-page' => url('admin/settings/content-types/page')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Page page.', array('%page' => 'http://drupal.org/handbook/modules/page/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Enables the creation of pages that can be added to the navigation system.');
+    case 'node/add#page':
+      return t('If you want to add a static page, like a contact page or an about page, use a page.');
+  }
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function page_perm() {
+  return array('create pages', 'edit own pages');
+}
+
+/**
+ * Implementation of hook_node_info().
+ */
+function page_node_info() {
+  return array('page' => array('name' => t('page'), 'base' => 'page'));
+}
+
+/**
+ * Implementation of hook_access().
+ */
+function page_access($op, $node) {
+  global $user;
+
+  if ($op == 'create') {
+    return user_access('create pages');
+  }
+
+  if ($op == 'update' || $op == 'delete') {
+    if (user_access('edit own pages') && ($user->uid == $node->uid)) {
+      return TRUE;
+    }
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function page_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'node/add/page', 'title' => t('page'),
+      'access' => user_access('create pages'));
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_form().
+ */
+function page_form(&$node) {
+
+  $form['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#required' => TRUE, '#default_value' => $node->title, '#weight' => -5);
+
+  $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#default_value' => $node->body, '#rows' => 20, '#required' => TRUE);
+  $form['body_filter']['format'] = filter_form($node->format);
+
+  $form['log'] = array(
+    '#type' => 'textarea', '#title' => t('Log message'), '#default_value' => $node->log, '#weight' => 5,
+    '#description' => t('An explanation of the additions or updates being made to help other authors understand your motivations.')
+  );
+
+  return $form;
+}
+
+
diff --git a/modules/path.module b/modules/path.module
new file mode 100644
index 0000000..5c93e32
--- /dev/null
+++ b/modules/path.module
@@ -0,0 +1,353 @@
+'. t('The path module allows you to specify aliases for Drupal URLs.  Such aliases improve readability of URLs for your users and may help internet search engines to index your content more effectively.  More than one alias may be created for a given page.') .'
                          ';
+      $output .= t('
                          Some examples of URL aliases are:
                          
+
                            
+
                          • user/login => login
                            • 
+
                          • image/tid/16 => store
                            • 
+
                          • taxonomy/term/7+19+20+21 => store/products/whirlygigs
                            • 
+
                          • node/3 => contact
                            • 
+
                          
+');
+      $output .= '
                          '. t('The path module enables an extra field for aliases in all node input and editing forms (when users have the appropriate permissions).  It also provides an interface to view and edit all URL aliases.  The two permissions are related to URL aliasing are "administer a list of URL aliases" and "add url aliases".  ') .'
                          ';
+      $output .= '
                          '. t('This module also comes with user-defined mass URL aliasing capabilities, which is useful if you wish to uniformly use URLs different from the default.  For example, you may want to have your URLs presented in a different language. Access to the Drupal source code on the web server is required to set up these kinds of aliases. ') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%admin-path-add' => url('admin/path/add'), '%admin-path' => url('admin/path'), '%external-http-drupal-org-node-15365' => 'http://drupal.org/node/15365', '%admin-settings' => url('admin/settings')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Path page.', array('%path' => 'http://drupal.org/handbook/modules/path/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Allows users to rename URLs.');
+    case 'admin/path':
+      return t("
                          Drupal provides users complete control over URLs through aliasing.  This feature is typically used to make URLs human-readable or easy to remember.  For example, one could map the relative URL 'node/1' onto 'about'. Each system path can have multiple aliases.
                          ");
+    case 'admin/path/add':
+      return t('
                          Enter the path you wish to create the alias for, followed by the name of the new alias.
                          ');
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function path_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'admin/path', 'title' => t('url aliases'),
+      'callback' => 'path_admin',
+      'access' => user_access('administer url aliases'));
+    $items[] = array('path' => 'admin/path/edit', 'title' => t('edit alias'),
+      'callback' => 'path_admin_edit',
+      'access' => user_access('administer url aliases'),
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/path/delete', 'title' => t('delete alias'),
+      'callback' => 'path_admin_delete_confirm',
+      'access' => user_access('administer url aliases'),
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/path/list', 'title' => t('list'),
+      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
+    $items[] = array('path' => 'admin/path/add', 'title' => t('add alias'),
+      'callback' => 'path_admin_edit',
+      'access' => user_access('administer url aliases'),
+      'type' => MENU_LOCAL_TASK);
+  }
+
+  return $items;
+}
+
+/**
+ * Menu callback; presents an overview of all URL aliases.
+ */
+function path_admin() {
+  return path_overview();
+}
+
+/**
+ * Menu callback; handles pages for creating and editing URL aliases.
+ */
+function path_admin_edit($pid = 0) {
+  if ($pid) {
+    $alias = path_load($pid);
+    drupal_set_title($alias['dst']);
+    $output = path_form(path_load($pid));
+  }
+  else {
+    $output = path_form();
+  }
+
+  return $output;
+}
+
+/**
+ * Menu callback; confirms deleting an URL alias
+ **/
+function path_admin_delete_confirm($pid) {
+  $path = path_load($pid);
+  if (user_access('administer url aliases')) {
+    $form['pid'] = array('#type' => 'value', '#value' => $pid);
+    $output = confirm_form('path_admin_delete_confirm', $form,
+  t('Are you sure you want to delete path alias %title?', array('%title' => theme('placeholder', $path['dst']))),
+   $_GET['destination'] ? $_GET['destination'] : 'admin/path', t('This action cannot be undone.'),
+  t('Delete'), t('Cancel') );
+  }
+
+  return $output;
+}
+
+/**
+ * Execute URL alias deletion
+ **/
+function path_admin_delete_confirm_submit($form_id, $form_values) {
+  if ($form_values['confirm']) {
+    path_admin_delete($form_values['pid']);
+    return 'admin/path';
+  }
+}
+
+/**
+ * Post-confirmation; delete an URL alias.
+ */
+function path_admin_delete($pid = 0) {
+  db_query('DELETE FROM {url_alias} WHERE pid = %d', $pid);
+  drupal_set_message(t('The alias has been deleted.'));
+}
+
+
+
+/**
+ * Set an aliased path for a given Drupal path, preventing duplicates.
+ */
+function path_set_alias($path = NULL, $alias = NULL, $pid = NULL) {
+  if ($path && !$alias) {
+    db_query("DELETE FROM {url_alias} WHERE src = '%s'", $path);
+    drupal_clear_path_cache();
+  }
+  else if (!$path && $alias) {
+    db_query("DELETE FROM {url_alias} WHERE dst = '%s'", $alias);
+    drupal_clear_path_cache();
+  }
+  else if ($path && $alias) {
+    $path = urldecode($path);
+    $path_count = db_result(db_query("SELECT COUNT(src) FROM {url_alias} WHERE src = '%s'", $path));
+    $alias = urldecode($alias);
+    $alias_count = db_result(db_query("SELECT COUNT(dst) FROM {url_alias} WHERE dst = '%s'", $alias));
+
+    // We have an insert:
+    if ($path_count == 0 && $alias_count == 0) {
+      db_query("INSERT INTO {url_alias} (src, dst) VALUES ('%s', '%s')", $path, $alias);
+      drupal_clear_path_cache();
+    }
+    else if ($path_count >= 1 && $alias_count == 0) {
+      if ($pid) {
+        db_query("UPDATE {url_alias} SET dst = '%s', src = '%s' WHERE pid = %d", $alias, $path, $pid);
+      }
+      else {
+        db_query("INSERT INTO {url_alias} (src, dst) VALUES ('%s', '%s')", $path, $alias);
+      }
+      drupal_clear_path_cache();
+    }
+    else if ($path_count == 0 && $alias_count == 1) {
+      db_query("UPDATE {url_alias} SET src = '%s' WHERE dst = '%s'", $path, $alias);
+      drupal_clear_path_cache();
+    }
+    else if ($path_count == 1 && $alias_count == 1) {
+      // This will delete the path that alias was originally pointing to:
+      path_set_alias(NULL, $alias);
+      path_set_alias($path);
+      path_set_alias($path, $alias);
+    }
+  }
+}
+
+/**
+ * Return a form for editing or creating an individual URL alias.
+ */
+function path_form($edit = '') {
+
+  $form['src'] = array('#type' => 'textfield', '#title' => t('Existing system path'), '#default_value' => $edit['src'], '#maxlength' => 64, '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.'));
+  $form['dst'] = array('#type' => 'textfield', '#default_value' => $edit['dst'], '#maxlength' => 64, '#description' => t('Specify an alternative path by which this data can be accessed.  For example, type "about" when writing an about page.  Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'));
+
+  if ($edit['pid']) {
+    $form['pid'] = array('#type' => 'hidden', '#value' => $edit['pid']);
+    $form['submit'] = array('#type' => 'submit', '#value' => t('Update alias'));
+  }
+  else {
+    $form['submit'] = array('#type' => 'submit', '#value' => t('Create new alias'));
+  }
+
+  return drupal_get_form('path_form', $form);
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ *
+ * Allows URL aliases for nodes to be specified at node edit time rather
+ * than through the administrative interface.
+ */
+function path_nodeapi(&$node, $op, $arg) {
+  if (user_access('create url aliases') || user_access('administer url aliases')) {
+    switch ($op) {
+      case 'validate':
+        $node->path = trim($node->path);
+        if ($node->path && !valid_url($node->path)) {
+          form_set_error('path', t('The path is invalid.'));
+        }
+        else if (db_result(db_query("SELECT COUNT(dst) FROM {url_alias} WHERE dst = '%s' AND src != '%s'", $node->path, "node/$node->nid"))) {
+          form_set_error('path', t('The path is already in use.'));
+        }
+        break;
+
+      case 'load':
+        $path = "node/$node->nid";
+        // We don't use drupal_get_path_alias() to avoid custom rewrite functions.
+        // We only care about exact aliases.
+        $result = db_query("SELECT dst FROM {url_alias} WHERE src = '%s'", $path);
+        if (db_num_rows($result)) {
+          $node->path = db_result($result);
+        }
+        break;
+
+      case 'insert':
+        // Don't try to insert if path is NULL.  We may have already set
+        // the alias ahead of time.
+        if ($node->path) {
+          path_set_alias("node/$node->nid", $node->path);
+        }
+        break;
+
+      case 'update':
+        path_set_alias("node/$node->nid", $node->path, $node->pid);
+        break;
+
+      case 'delete':
+        $path = "node/$node->nid";
+        if (drupal_get_path_alias($path) != $path) {
+          path_set_alias($path);
+        }
+        break;
+    }
+  }
+}
+
+/**
+ * Implementation of hook_form_alter().
+ */
+function path_form_alter($form_id, &$form) {
+  if (user_access('create url aliases') && isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    $path = $form['#node']->path;
+    $form['path'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('URL path settings'),
+      '#collapsible' => TRUE,
+      '#collapsed' => empty($path),
+      '#weight' => 30,
+    );
+    $form['path']['path'] = array(
+      '#type' => 'textfield',
+      '#default_value' => $path,
+      '#maxlength' => 250,
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+      '#description' => t('Optionally specify an alternative URL by which this node can be accessed.  For example, type "about" when writing an about page.  Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'),
+    );
+    if ($path) {
+      $form['path']['pid'] = array(
+        '#type' => 'value',
+        '#value' => db_result(db_query("SELECT pid FROM {url_alias} WHERE dst = '%s'", $path))
+      );
+    }
+  }
+}
+
+
+/**
+ * Implementation of hook_perm().
+ */
+function path_perm() {
+  return array('create url aliases', 'administer url aliases');
+}
+
+/**
+ * Return a listing of all defined URL aliases.
+ */
+function path_overview() {
+  $sql = 'SELECT * FROM {url_alias}';
+  $header = array(
+    array('data' => t('Alias'), 'field' => 'dst', 'sort' => 'asc'),
+    array('data' => t('System'), 'field' => 'src'),
+    array('data' => t('Operations'), 'colspan' => '2')
+  );
+  $sql .= tablesort_sql($header);
+  $result = pager_query($sql, 50);
+
+  $destination = drupal_get_destination();
+  while ($data = db_fetch_object($result)) {
+    $rows[] = array($data->dst, $data->src, l(t('edit'), "admin/path/edit/$data->pid", array(), $destination), l(t('delete'), "admin/path/delete/$data->pid", array(), $destination));
+  }
+
+  if (!$rows) {
+    $rows[] = array(array('data' => t('No URL aliases available.'), 'colspan' => '4'));
+  }
+
+  $output = theme('table', $header, $rows);
+  $output .= theme('pager', NULL, 50, 0);
+  return $output;
+}
+
+/**
+ * Fetch a specific URL alias from the database.
+ */
+function path_load($pid) {
+  return db_fetch_array(db_query('SELECT * FROM {url_alias} WHERE pid = %d', $pid));
+}
+
+/**
+ * Verify that a new URL alias is valid, and save it to the database.
+ */
+function path_form_submit() {
+  $edit = $GLOBALS['form_values'];
+  $src = $edit['src'];
+  $dst = $edit['dst'];
+  $pid = $edit['pid'];
+
+  if (!valid_url($src)) {
+    form_set_error('src', t('The system path %path is invalid.', array('%path' => theme('placeholder', $src))));
+  }
+
+  if (!valid_url($dst)) {
+    form_set_error('dst', t('The alias %alias is invalid.', array('%alias' => theme('placeholder', $dst))));
+  }
+
+  if (db_result(db_query("SELECT COUNT(dst) FROM {url_alias} WHERE pid != %d AND dst = '%s'", $pid, $dst))) {
+    form_set_error('dst', t('The alias %alias is already in use.', array('%alias' => theme('placeholder', $dst))));
+  }
+
+  if (form_get_errors()) {
+    return path_form($edit);
+  }
+  else {
+    path_set_alias($src, $dst, $pid);
+
+    drupal_set_message(t('The alias has been saved.'));
+    return 'admin/path';
+  }
+}
+
+
diff --git a/modules/ping.module b/modules/ping.module
new file mode 100644
index 0000000..fdf45e9
--- /dev/null
+++ b/modules/ping.module
@@ -0,0 +1,68 @@
+'. t('The ping module is useful for notifying interested sites that your site has changed.  It automatically sends notifications (called "pings") to the pingomatic service to tell it that your site has changed. In turn pingomatic will ping other services such as weblogs.com, Technorati, blo.gs, BlogRolling, Feedster.com, Moreover, etc.', array('%external-http-pingomatic-com' => 'http://pingomatic.com/')) .'
                          ';
+      $output .= '
                          '. t('The ping module requires cron or a similar periodic job scheduler to be enabled.') .'
                          ';
+      $output .= t('
                          You can:
                          
+
                          
+', array('%admin-modules' => url('admin/modules'), '%file-cron' => 'cron.php', '%external-http-drupal-org-node-23714' => 'http://drupal.org/node/23714'));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Ping page.', array('%ping' => 'http://drupal.org/handbook/modules/ping/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Alerts other sites when your site has been updated.');
+  }
+}
+
+/**
+ * Implementation of hook_cron().
+ *
+ * Fire off notifications of updates to remote sites.
+ */
+function ping_cron() {
+  global $base_url;
+
+  if (variable_get('site_name', 0) && variable_get('site_slogan', 0)) {
+    if (db_num_rows(db_query("SELECT nid FROM {node} WHERE status = 1 AND moderate = 0 AND (created > '". variable_get('cron_last', time()) ."' OR changed > '". variable_get('cron_last', time()) ."')"))) {
+      _ping_notify(variable_get('site_name', '') .' - '. variable_get('site_slogan', ''), $base_url);
+    }
+  }
+}
+
+/**
+ * Call hook_ping() in all modules to notify remote sites that there is
+ * new content at this one.
+ */
+function _ping_notify($name, $url) {
+  module_invoke_all('ping', $name, $url);
+}
+
+/**
+ * Implementation of hook_ping().
+ *
+ * Notifies pingomatic.com, blo.gs, and technorati.com of changes at this site.
+ */
+function ping_ping($name = '', $url = '') {
+
+  $result = xmlrpc('http://rpc.pingomatic.com', 'weblogUpdates.ping', $name, $url);
+
+  if ($result === FALSE) {
+    watchdog('directory ping', t('Failed to notify pingomatic.com (site).'), WATCHDOG_WARNING);
+  }
+}
+
+
diff --git a/modules/planetlab.module b/modules/planetlab.module
new file mode 100644
index 0000000..735049a
--- /dev/null
+++ b/modules/planetlab.module
@@ -0,0 +1,319 @@
+
+  // Copyright (C) 2006 The Trustees of Princeton University
+  //
+  // $Id: planetlab.module 809 2007-09-03 09:47:40Z thierry $
+  //
+
+require_once 'plc_config.php';
+require_once 'plc_session.php';
+
+function planetlab_help($section)
+{
+  switch ($section) {
+  case 'admin/modules#description':
+    return t('Enables authenticated login via a PlanetLab API server.');
+  }
+}
+
+function planetlab_info($field = 0)
+{
+  $info['name'] = 'PlanetLab';
+
+  if ($field) {
+    return $info[$field];
+  }
+  else {
+    return $info;
+  }
+}
+
+function planetlab_menu($may_cache)
+{
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array(
+		     'path' => 'planetlab/logout',
+		     'title' => t('Log out of %s', array('%s' => variable_get('site_name', 'local'))),
+		     'callback' => 'planetlab_logout',
+		     'access' => TRUE,
+		     'type' => MENU_CALLBACK
+		     );
+    $items[] = array(
+		     'path' => 'db',
+		     'title' => variable_get('site_name', 'local'),
+		     'callback' => 'planetlab_page',
+		     'access' => TRUE,
+		     'type' => MENU_CALLBACK
+		     );
+  }
+
+  return $items;
+}
+
+function planetlab_block($op = 'list', $delta = 0, $edit = array())
+{
+  global $user, $plc;
+
+  if ($op == 'list') {
+    $blocks[0]['info'] = t('PlanetLab login');
+
+    return $blocks;
+  }
+  else if ($op == 'view') {
+    $block = array();
+
+    if (!$plc->person) {
+      // Force login via HTTPS
+      unset($_GET['time']);
+      $form['#action'] = "https://" . $_SERVER['HTTP_HOST'] . url($_GET['q'], drupal_get_destination());
+      $form['#id'] = 'planetlab-login-form';
+      $form['name'] = array('#type' => 'textfield',
+			    '#title' => t('E-mail'),
+			    '#maxlength' => 60,
+			    '#size' => 25,
+			    '#required' => TRUE,
+			    );
+      $form['pass'] = array('#type' => 'password',
+			    '#title' => t('Password'),
+			    '#size' => 25,
+			    '#required' => TRUE,
+			    );
+      $form['submit'] = array('#type' => 'submit',
+			      '#value' => t('Log in'),
+			      );
+
+      $block['subject'] = t('%s login', array('%s' => variable_get('site_name', 'local')));
+      $block['content'] = drupal_get_form('planetlab_login_block', $form, 'planetlab_login');
+      $block['content'] .= '
                          Forgot your password?
                          ';
+      $block['content'] .= '
                          Create an account
                          ';
+      $block['content'] .= '
                          File a site registration
                          ';
+    } else {
+      $block['subject'] = $plc->person['email'];
+      $is_admin = in_array(10,$plc->person['role_ids']);
+      $is_pi =    in_array(20,$plc->person['role_ids']);
+      $is_user =  in_array(30,$plc->person['role_ids']);
+      $is_tech =  in_array(40,$plc->person['role_ids']);
+
+      $site_item = '';
+      $site_item .= 'Sites';
+      $site_item .= '";
+      $items[] = $site_item;
+
+      $user_item = '';
+      $user_item .= 'Users';
+      $user_item .= '
                            ';
+      $user_item .= '
                          • My account
                            • ';
+      if (is_pi) 
+	$user_item .= '
                          • My users
                            • ';
+      if ( $plc->alt_person && $plc->alt_auth) {
+	$email = $plc->person['email']; 
+	$user_item .= "
                          • Log out of $email 
                            • ";
+      }	
+
+
+      $user_item .= '
                          ';
+      $items [] = $user_item;
+
+      $node_item = '';
+      $node_item .= 'Nodes';
+      $node_item .= '';
+      $items [] = $node_item;
+
+      $slice_item = '';
+      //if( !( $is_tech && ! $is_user && ! $is_pi && ! $is_admin ) ) 
+      $slice_item .= 'Slices';
+      $slice_item .= '
                            ';
+      if( $is_admin || $is_pi ) {
+	$slice_item .= "
                          • Create Slice
                            • ";
+	$slice_item .= "
                          • Attribute Types
                            • ";
+      }
+      if( !( $is_tech && ! $is_user && ! $is_pi && ! $is_admin ) ) 
+	$slice_item .= '
                          • Sirius
                            • ';
+      $slice_item .= '
                          ';
+      $items [] = $slice_item;
+
+      if ( $is_admin )
+	$items[] = l(t('Peers'),'db/peers/');
+     
+      if ( $is_admin )
+	$items[] = l(t('Events'),'db/events/');
+      
+      $items[] = l(t('About'),'db/about.php');
+
+      if ($user->uid) {
+	// Drupal logout (destroys the session and cleans up $user)
+	$items[] = l(t('Log out of %s', array('%s' => variable_get('site_name', 'local'))), 'logout');
+      } else {
+	// PlanetLab logout (just destroy the session)
+	$items[] = l(t('Log out'), 'planetlab/logout');
+      }
+
+      $block['content'] = theme('item_list', $items);
+    }
+
+    /*
+     ob_start();
+     print '
                          ';
+     print_r($_SESSION);
+     print '
                          ';
+     $block['content'] .= ob_get_contents();
+     ob_end_clean();
+    */
+
+    return $block;
+  }
+}
+
+function planetlab_login_validate($form_id, $form_values)
+{
+  global $user, $plc;
+
+  if ($form_values['name'] && $form_values['pass']) {
+    // Drupal login succeeded
+    if (($user = user_authenticate($form_values['name'], trim($form_values['pass']))) &&
+	$user->uid) {
+      return;
+    }
+
+    $plc = new PLCSession($form_values['name'], $form_values['pass']);
+
+    // PlanetLab login failed
+    if (!$plc->person) {
+      form_set_error('login', t('Sorry. Unrecognized username or password.'));
+      watchdog('planetlab', t('Login attempt failed for %user.', array('%user' => theme('placeholder', $form_values['name']))));
+    }
+
+    // PlanetLab login succeeded
+    else {
+      // Login admins to Drupal as the superuser
+      if (in_array('admin', $plc->person['roles'])) {
+	$user = user_load(array('uid' => 1));
+      }
+    }
+  }
+}
+
+function planetlab_login_submit($form_id, $form_values)
+{
+  global $plc;
+
+  // Our referring page is encased in a query string of the form
+  // "destination=referrer".
+  parse_str(drupal_get_destination()); // => $destination
+
+  // The referrer itself is a URL path with the original query string,
+  // e.g. "referer.php?query".
+  extract(parse_url($destination)); // => $query
+
+  // Which we then have to parse again as a query string.
+  parse_str($query); // => $url
+
+  if ($plc->person) {
+    // To handle the edge case where this function is called during a
+    // bootstrap, check for the existence of t().
+    if (function_exists('t')) {
+      $message = t('Session opened for %name.', array('%name' => theme('placeholder', $plc->person['email'])));
+    }
+    else {
+      $message = "Session opened for ". check_plain($person['email']);
+    }
+    watchdog('planetlab', $message);
+
+    if (empty($url)) {
+      // Create a timestamped final URL so that browsers don't return the user to
+      // a cached page (where it would appear as if they never logged in or out).
+      return array('time='. time());
+    } else {
+      // Make sure that redirections are always local
+      $url = urldecode($url);
+      if ($url[0] != "/") {
+	$url = "/$url";
+      }
+      Header("Location: $url");
+      exit();
+    }
+  }
+}
+
+function planetlab_logout()
+{
+  global $plc;
+
+  if ($plc->person) {
+    // Invalidate PlanetLab session
+    $plc->logout();
+    watchdog('planetlab', t('Session closed for %name.', array('%name' => theme('placeholder', $plc->person['email']))));
+  }
+
+  // Destroy the current session:
+  session_destroy();
+
+  // The time prevents caching.
+  drupal_goto(NULL, 'time='. time());
+}
+
+function planetlab_user($type, &$edit, &$user, $category = NULL)
+{
+  switch ($type) {
+  case 'logout':
+    if ($plc->person) {
+      $plc->logout();
+      watchdog('planetlab', t('Session closed for %name.', array('%name' => theme('placeholder', $plc->person['email']))));
+    }
+    break;
+  }
+}
+
+function planetlab_page()
+{
+  $path = $_SERVER['DOCUMENT_ROOT'] . preg_replace('/^db\//', '/planetlab/', $_GET['q']);
+
+  // error_log("Requested " . $_GET['q'] . " -> $path");
+
+  if (is_dir($path)) {
+    foreach (array('index.php', 'index.html', 'index.htm') as $index) {
+      if (is_file($path . "/$index")) {
+	$path .= "/$index";
+	break;
+      }
+    }
+  }
+
+  if (is_file($path)) {
+    if (preg_match('/.php$/', $path)) {
+      ob_start();
+      include $path;
+      $output = ob_get_contents();
+      ob_end_clean();
+    } else {
+      $output = file_get_contents($path);
+    }
+    return $output;
+  }
+	    
+  drupal_not_found();
+}
+
+function theme_planetlab($content)
+{
+  return $content;
+}
+
+?>
diff --git a/modules/poll.module b/modules/poll.module
new file mode 100644
index 0000000..14a85a8
--- /dev/null
+++ b/modules/poll.module
@@ -0,0 +1,501 @@
+'. t('The poll module can be used to create simple polls for site users.  A poll is a simple multiple choice questionnaire which displays the cumulative results of the answers to the poll.  Having polls on the site is a good way to get instant feedback from community members.') .'
                          ';
+      $output .= '
                          '. t('Users can create a poll. The title of the poll should be the question, then enter the answers and the "base" vote counts. You can also choose the time period over which the vote will run.The poll item in the navigation menu will take you to a page where you can see all the current polls, vote on them (if you haven\'t already) and view the results.', array('%poll' => url('poll'))) .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%poll' => url('poll'), '%admin-node-configure-types-poll' => url('admin/settings/content-types/poll')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Poll page.', array('%poll' => 'http://drupal.org/handbook/modules/poll/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t("Allows your site to capture votes on different topics in the form of multiple choice questions.");
+    case 'node/add#poll':
+      return t("A poll is a multiple-choice question which visitors can vote on.");
+  }
+}
+
+/**
+ * Implementation of hook_access().
+ */
+function poll_access($op, $node) {
+  if ($op == 'create') {
+    return user_access('create polls');
+  }
+}
+
+/**
+ * Implementation of hook_block().
+ *
+ * Generates a block containing the latest poll.
+ */
+function poll_block($op = 'list', $delta = 0) {
+  if (user_access('access content')) {
+    if ($op == 'list') {
+      $blocks[0]['info'] = t('Most recent poll');
+      return $blocks;
+    }
+    else if ($op == 'view') {
+      // Retrieve the latest poll.
+      $sql = db_rewrite_sql("SELECT MAX(n.created) FROM {node} n INNER JOIN {poll} p ON p.nid = n.nid WHERE n.status = 1 AND p.active = 1 AND n.moderate = 0");
+      $timestamp = db_result(db_query($sql));
+      if ($timestamp) {
+        $poll = node_load(array('type' => 'poll', 'created' => $timestamp, 'moderate' => 0, 'status' => 1));
+
+        if ($poll->nid) {
+          // poll_view() dumps the output into $poll->body.
+          poll_view($poll, 1, 0, 1);
+        }
+      }
+      $block['subject'] = t('Poll');
+      $block['content'] = $poll->body;
+      return $block;
+    }
+  }
+}
+
+/**
+ * Implementation of hook_cron().
+ *
+ * Closes polls that have exceeded their allowed runtime.
+ */
+function poll_cron() {
+  $result = db_query('SELECT p.nid FROM {poll} p INNER JOIN {node} n ON p.nid = n.nid WHERE (n.created + p.runtime) < '. time() .' AND p.active = 1 AND p.runtime != 0');
+  while ($poll = db_fetch_object($result)) {
+    db_query("UPDATE {poll} SET active = 0 WHERE nid = %d", $poll->nid);
+  }
+}
+
+/**
+ * Implementation of hook_delete().
+ */
+function poll_delete($node) {
+  db_query("DELETE FROM {poll} WHERE nid = %d", $node->nid);
+  db_query("DELETE FROM {poll_choices} WHERE nid = %d", $node->nid);
+  db_query("DELETE FROM {poll_votes} WHERE nid = %d", $node->nid);
+}
+
+/**
+ * Implementation of hook_submit().
+ */
+function poll_submit(&$node) {
+  // Renumber fields
+  $node->choice = array_values($node->choice);
+  $node->teaser = poll_teaser($node);
+}
+
+/**
+ * Implementation of hook_validate().
+ */
+function poll_validate($node) {
+  if (isset($node->title)) {
+    // Check for at least two options and validate amount of votes:
+    $realchoices = 0;
+    // Renumber fields
+    $node->choice = array_values($node->choice);
+    foreach ($node->choice as $i => $choice) {
+      if ($choice['chtext'] != '') {
+        $realchoices++;
+      }
+      if ($choice['chvotes'] < 0) {
+        form_set_error("choice][$i][chvotes", t('Negative values are not allowed.'));
+      }
+    }
+
+    if ($realchoices < 2) {
+      form_set_error("choice][$realchoices][chtext", t('You must fill in at least two choices.'));
+    }
+  }
+}
+
+/**
+ * Implementation of hook_form().
+ */
+function poll_form(&$node) {
+  $admin = user_access('administer nodes');
+
+  $form['title'] = array('#type' => 'textfield', '#title' => t('Question'), '#required' => TRUE, '#default_value' => $node->title, '#weight' => -1);
+
+  $form['choice']['choices'] = array('#type' => 'hidden', '#default_value' => max(2, count($node->choice) ? count($node->choice) : 5));
+  $form['choice']['morechoices'] = array('#type' => 'checkbox', '#title' => t('Need more choices'), '#default_value' => 0, '#description' => t("If the amount of boxes above isn't enough, check this box and click the Preview button below to add some more."), '#weight' => 1);
+  $form['choice'] = form_builder('poll_node_form', $form['choice']);
+  if ($form['choice']['morechoices']['#value']) {
+    $form['choice']['morechoices']['#value'] = 0;
+    $form['choice']['choices']['#value'] *= 2;
+  }
+
+  // if the value was changed in a previous iteration, retain it.
+  $node->choices = $form['choice']['choices']['#value'];
+
+  // Poll choices
+  $form['choice'] += array('#type' => 'fieldset', '#title' => t('Choices'), '#prefix' => '
                          ', '#suffix' => '
                          ', '#tree' => TRUE);
+  for ($a = 0; $a < $node->choices; $a++) {
+    $form['choice'][$a]['chtext'] = array('#type' => 'textfield', '#title' => t('Choice %n', array('%n' => ($a + 1))), '#default_value' => $node->choice[$a]['chtext']);
+    if ($admin) {
+      $form['choice'][$a]['chvotes'] = array('#type' => 'textfield', '#title' => t('Votes for choice %n', array('%n' => ($a + 1))), '#default_value' => (int)$node->choice[$a]['chvotes'], '#size' => 5, '#maxlength' => 7);
+    }
+  }
+
+  // Poll attributes
+  $_duration = array(0 => t('Unlimited')) + drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 2419200, 4838400, 9676800, 31536000), "format_interval");
+  $_active = array(0 => t('Closed'), 1 => t('Active'));
+
+  if ($admin) {
+    $form['settings'] = array('#type' => 'fieldset', '#title' => t('Settings'));
+    $form['settings']['active'] = array('#type' => 'radios', '#title' => t('Poll status'), '#default_value' => isset($node->active) ? $node->active : 1, '#options' => $_active, '#description' => t('When a poll is closed, visitors can no longer vote for it.'));
+  }
+  $form['settings']['runtime'] = array('#type' => 'select', '#title' => t('Poll duration'), '#default_value' => $node->runtime ? $node->runtime : 0, '#options' => $_duration, '#description' => t('After this period, the poll will be closed automatically.'));
+
+  return $form;
+}
+
+function poll_insert($node) {
+  if (!user_access('administer nodes')) {
+    // Make sure all votes are 0 initially
+    foreach ($node->choice as $i => $choice) {
+      $node->choice[$i]['chvotes'] = 0;
+    }
+    $node->active = 1;
+  }
+
+  db_query("INSERT INTO {poll} (nid, runtime, active) VALUES (%d, %d, %d)", $node->nid, $node->runtime, $node->active);
+
+  foreach ($node->choice as $choice) {
+    if ($choice['chtext'] != '') {
+      db_query("INSERT INTO {poll_choices} (nid, chtext, chvotes, chorder) VALUES (%d, '%s', %d, %d)", $node->nid, $choice['chtext'], $choice['chvotes'], $i++);
+    }
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function poll_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'node/add/poll', 'title' => t('poll'),
+      'access' => user_access('create polls'));
+    $items[] = array('path' => 'poll', 'title' => t('polls'),
+      'callback' => 'poll_page',
+      'access' => user_access('access content'),
+      'type' => MENU_SUGGESTED_ITEM);
+
+    $items[] = array('path' => 'poll/vote',
+      'title' => t('vote'),
+      'callback' => 'poll_vote',
+      'access' => user_access('vote on polls'),
+      'type' => MENU_CALLBACK);
+  }
+  else {
+    if (arg(0) == 'node' && is_numeric(arg(1))) {
+      $node = node_load(arg(1));
+
+      if ($node->type == 'poll' && $node->allowvotes) {
+        $items[] = array('path' => 'node/'. arg(1) .'/results',
+          'title' => t('results'),
+          'callback' => 'poll_results',
+          'access' => user_access('access content'),
+          'weight' => 3,
+          'type' => MENU_LOCAL_TASK);
+      }
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_load().
+ */
+function poll_load($node) {
+  global $user;
+
+  // Load the appropriate choices into the $node object
+  $poll = db_fetch_object(db_query("SELECT runtime, active FROM {poll} WHERE nid = %d", $node->nid));
+
+  $result = db_query("SELECT chtext, chvotes, chorder FROM {poll_choices} WHERE nid = %d ORDER BY chorder", $node->nid);
+  while ($choice = db_fetch_array($result)) {
+    $poll->choice[$choice['chorder']] = $choice;
+  }
+
+  // Determine whether or not this user is allowed to vote
+  $poll->allowvotes = FALSE;
+  if (user_access('vote on polls') && $poll->active) {
+    if ($user->uid && db_num_rows(db_query('SELECT uid FROM {poll_votes} WHERE nid = %d AND uid = %d', $node->nid, $user->uid)) == 0) {
+      $poll->allowvotes = TRUE;
+    }
+    else if ($user->uid == 0 && db_num_rows(db_query("SELECT hostname FROM {poll_votes} WHERE nid = %d AND hostname = '%s'", $node->nid, $_SERVER['REMOTE_ADDR'])) == 0) {
+      $poll->allowvotes = TRUE;
+    }
+  }
+  return $poll;
+}
+
+/**
+ * Implementation of hook_node_info().
+ */
+function poll_node_info() {
+  return array('poll' => array('name' => t("poll"), 'base' => 'poll'));
+}
+
+function poll_page() {
+  // List all polls
+  $sql = "SELECT n.nid, n.title, p.active, n.created, SUM(c.chvotes) AS votes FROM {node} n INNER JOIN {poll} p ON n.nid = p.nid INNER JOIN {poll_choices} c ON n.nid = c.nid WHERE n.status = 1 AND n.moderate = 0 GROUP BY n.nid, n.title, p.active, n.created ORDER BY n.created DESC";
+  $sql = db_rewrite_sql($sql);
+  $result = pager_query($sql, 15);
+  $output = '
                            ';
+  while ($node = db_fetch_object($result)) {
+    $output .= '
                          • '. l($node->title, "node/$node->nid") .' - '. format_plural($node->votes, '1 vote', '%count votes') .' - '. ($node->active ? t('open') : t('closed')) .'
                            • ';
+  }
+  $output .= '
                          ';
+  $output .= theme("pager", NULL, 15);
+  return $output;
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function poll_perm() {
+  return array('create polls', 'vote on polls');
+}
+
+/**
+ * Creates a simple teaser that lists all the choices.
+ */
+function poll_teaser($node) {
+  $teaser = NULL;
+  if (is_array($node->choice)) {
+    foreach ($node->choice as $k => $choice) {
+      $teaser .= '* '. $choice['chtext'] .'\n';
+    }
+  }
+  return $teaser;
+}
+
+/**
+ * Generates the voting form for a poll.
+ */
+function poll_view_voting(&$node, $teaser, $page, $block) {
+  if ($_POST['op'] == t('Vote')) {
+    poll_vote($node);
+  }
+
+  if ($node->choice) {
+    $list = array();
+    foreach ($node->choice as $i => $choice) {
+      $list[$i] = check_plain($choice['chtext']);
+    }
+    $form['choice'] = array('#type' => 'radios', '#title' => $page ? '' : check_plain($node->title), '#default_value' => -1, '#options' => $list);
+  }
+  $form['nid'] = array('#type' => 'hidden', '#value' => $node->nid);
+  $form['vote'] = array('#type' => 'submit', '#value' => t('Vote'));
+  $form['#action'] = url('node/'. $node->nid);
+  return drupal_get_form('poll_view_voting', $form);
+}
+
+/**
+ * Themes the voting form for a poll.
+ */
+function theme_poll_view_voting($form) {
+  $output .= '
                          ';
+  $output .= '  
                          ';
+  $output .= '    
                          ';
+  $output .= form_render($form['choice']);
+  $output .= '    
                          ';
+  $output .= form_render($form['nid']);
+  $output .= form_render($form['vote']);
+  $output .= '  
                          ';
+  $output .= form_render($form);
+  $output .= '
                          ';
+  return $output;
+}
+
+/**
+ * Generates a graphical representation of the results of a poll.
+ */
+function poll_view_results(&$node, $teaser, $page, $block) {
+  // Count the votes and find the maximum
+  foreach ($node->choice as $choice) {
+    $total_votes += $choice['chvotes'];
+    $max_votes = max($max_votes, $choice['chvotes']);
+  }
+
+  foreach ($node->choice as $i => $choice) {
+    if ($choice['chtext'] != '') {
+      $poll_results .= theme('poll_bar', check_plain($choice['chtext']), round($choice['chvotes'] * 100 / max($total_votes, 1)), format_plural($choice['chvotes'], '1 vote', '%count votes'), $block);
+    }
+  }
+
+  $output .= theme('poll_results', check_plain($node->title), $poll_results, $total_votes, $node->links, $block);
+
+  return $output;
+}
+
+function theme_poll_results($title, $results, $votes, $links, $block) {
+  if ($block) {
+    $output .= '
                          ';
+    $output .= '
                          '. $title .'
                          ';
+    $output .= $results;
+    $output .= '
                          '. t('Total votes: %votes', array('%votes' => $votes)) .'
                          ';
+    $output .= '
                          ';
+    $output .= '
                          '. theme('links', $links) .'
                          ';
+  }
+  else {
+    $output .= '
                          ';
+    $output .= $results;
+    $output .= '
                          '. t('Total votes: %votes', array('%votes' => $votes)) .'
                          ';
+    $output .= '
                          ';
+  }
+
+  return $output;
+}
+
+function theme_poll_bar($title, $percentage, $votes, $block) {
+  if ($block) {
+    $output  = '
                          '. $title .'
                          ';
+    $output .= '
                          ';
+    $output .= '
                          '. $percentage .'%
                          ';
+  }
+  else {
+    $output  = '
                          '. $title .'
                          ';
+    $output .= '
                          ';
+    $output .= '
                          '. $percentage .'% ('. $votes .')
                          ';
+  }
+
+  return $output;
+}
+
+/**
+ * Callback for the 'results' tab for polls you can vote on
+ */
+function poll_results() {
+  if ($node = node_load(arg(1))) {
+    drupal_set_title(check_plain($node->title));
+    return node_show($node, 0);
+  }
+  else {
+    drupal_not_found();
+  }
+}
+
+/**
+ * Callback for processing a vote
+ */
+function poll_vote(&$node) {
+  global $user;
+  $nid = arg(1);
+
+  if ($node = node_load($nid)) {
+    $edit = $_POST['edit'];
+    $choice = $edit['choice'];
+    $vote = $_POST['vote'];
+
+    if (isset($choice) && isset($node->choice[$choice])) {
+      if ($node->allowvotes) {
+        // Mark the user or host as having voted.
+        if ($user->uid) {
+          db_query('INSERT INTO {poll_votes} (nid, uid) VALUES (%d, %d)', $node->nid, $user->uid);
+        }
+        else {
+          db_query("INSERT INTO {poll_votes} (nid, hostname) VALUES (%d, '%s')", $node->nid, $_SERVER['REMOTE_ADDR']);
+        }
+
+        // Add one to the votes.
+        db_query("UPDATE {poll_choices} SET chvotes = chvotes + 1 WHERE nid = %d AND chorder = %d", $node->nid, $choice);
+
+        $node->allowvotes = FALSE;
+        $node->choice[$choice]['chvotes']++;
+        drupal_set_message(t('Your vote was recorded.'));
+      }
+      else {
+        drupal_set_message(t("You're not allowed to vote on this poll."), 'error');
+      }
+    }
+    else {
+      drupal_set_message(t("You didn't specify a valid poll choice."), 'error');
+    }
+
+    drupal_goto('node/'. $nid);
+  }
+  else {
+    drupal_not_found();
+  }
+}
+
+/**
+ * Implementation of hook_view().
+ *
+ * @param $block
+ *   An extra parameter that adapts the hook to display a block-ready
+ *   rendering of the poll.
+ */
+function poll_view(&$node, $teaser = FALSE, $page = FALSE, $block = FALSE) {
+  global $user;
+  $output = '';
+
+  // Special display for side-block
+  if ($block) {
+    // No 'read more' link
+    $node->body = $node->teaser = '';
+
+    $links = module_invoke_all('link', 'node', $node, 1);
+    $links[] = l(t('older polls'), 'poll', array('title' => t('View the list of polls on this site.')));
+    if ($node->allowvotes && $block) {
+      $links[] = l(t('results'), 'node/'. $node->nid .'/results', array('title' => t('View the current poll results.')));
+    }
+
+    $node->links = $links;
+  }
+
+  if ($node->allowvotes && ($block || arg(2) != 'results')) {
+    $output .= poll_view_voting($node, $teaser, $page, $block);
+  }
+  else {
+    $output .= poll_view_results($node, $teaser, $page, $block);
+  }
+
+  $node->body = $node->teaser = $output;
+}
+
+/**
+ * Implementation of hook_update().
+ */
+function poll_update($node) {
+  db_query('UPDATE {poll} SET runtime = %d, active = %d WHERE nid = %d', $node->runtime, $node->active, $node->nid);
+
+  db_query('DELETE FROM {poll_choices} WHERE nid = %d', $node->nid);
+  db_query('DELETE FROM {poll_votes} WHERE nid = %d', $node->nid);
+  foreach ($node->choice as $choice) {
+    $chvotes = (int)$choice['chvotes'];
+    $chtext = $choice['chtext'];
+
+    if ($chtext != '') {
+      db_query("INSERT INTO {poll_choices} (nid, chtext, chvotes, chorder) VALUES (%d, '%s', %d, %d)", $node->nid, $chtext, $chvotes, $i++);
+    }
+  }
+}
+
+/**
+ * Implementation of hook_user().
+ */
+function poll_user($op, &$edit, &$user) {
+  if ($op == 'delete') {
+    db_query('UPDATE {poll_votes} SET uid = 0 WHERE uid = %d', $user->uid);
+  }
+}
diff --git a/modules/profile.module b/modules/profile.module
new file mode 100644
index 0000000..30bb492
--- /dev/null
+++ b/modules/profile.module
@@ -0,0 +1,788 @@
+'. t('The profile module allows you to define custom fields (such as country, real name, age, ...) in the user profile. This permits users of a site to share more information about themselves, and can help community-based sites to organize users around profile fields.') .'
                          ';
+      $output .= t('
                          The following types of fields can be added to the user profile:
                          
+
                            
+
                          • single-line textfield
                            • 
+
                          • multi-line textfield
                            • 
+
                          • checkbox
                            • 
+
                          • list selection
                            • 
+
                          • freeform list
                            • 
+
                          • URL
                            • 
+
                          • date
                            • 
+
                          
+');
+      $output .= t('
                          You can
                          
+
+', array('%profile' => url('profile'), '%admin-settings-profile' => url('admin/settings/profile')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Profile page.', array('%profile' => 'http://drupal.org/handbook/modules/profile/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Supports configurable user profiles.');
+    case 'admin/settings/profile':
+      return t('
                          Here you can define custom fields that users can fill in in their user profile (such as country, real name, age, ...).
                          ');
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function profile_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'profile',
+      'title' => t('user list'),
+      'callback' => 'profile_browse',
+      'access' => user_access('access user profiles'),
+      'type' => MENU_SUGGESTED_ITEM);
+    $items[] = array('path' => 'admin/settings/profile',
+      'title' => t('profiles'),
+      'callback' => 'profile_admin_overview');
+    $items[] = array('path' => 'admin/settings/profile/add',
+      'title' => t('add field'),
+      'callback' => 'profile_field_form',
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/settings/profile/edit',
+      'title' => t('edit field'),
+      'callback' => 'profile_field_form',
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/settings/profile/delete',
+      'title' => t('delete field'),
+      'callback' => 'profile_field_delete',
+      'type' => MENU_CALLBACK);
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_block().
+ */
+function profile_block($op = 'list', $delta = 0, $edit = array()) {
+
+  if ($op == 'list') {
+     $blocks[0]['info'] = t('Author information');
+
+     return $blocks;
+  }
+  else if ($op == 'configure' && $delta == 0) {
+    // Compile a list of fields to show
+    $fields = array();
+    $result = db_query('SELECT name, title, weight, visibility FROM {profile_fields} WHERE visibility IN (%d, %d) ORDER BY weight', PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS);
+    while ($record = db_fetch_object($result)) {
+      $fields[$record->name] = $record->title;
+    }
+    $fields['user_profile'] = t('Link to full user profile');
+    $form['profile_block_author_fields'] = array('#type' => 'checkboxes',
+      '#title' => t('Profile fields to display'),
+      '#default_value' => variable_get('profile_block_author_fields', NULL),
+      '#options' => $fields,
+      '#description' => t('Select which profile fields you wish to display in the block. Only fields designated as public in the profile field configuration are available.', array('%profile-admin' => url('admin/settings/profile'))),
+    );
+    return $form;
+  }
+  else if ($op == 'save' && $delta == 0) {
+    variable_set('profile_block_author_fields', $edit['profile_block_author_fields']);
+  }
+  else if ($op == 'view') {
+    if (user_access('access user profiles')) {
+      if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) {
+        $node = node_load(arg(1));
+        $account = user_load(array('uid' => $node->uid));
+
+        if ($use_fields = variable_get('profile_block_author_fields', array())) {
+          // Compile a list of fields to show.
+          $fields = array();
+          $result = db_query('SELECT name, title, type, visibility, weight FROM {profile_fields} WHERE visibility IN (%d, %d) ORDER BY weight', PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS);
+          while ($record = db_fetch_object($result)) {
+            // Ensure that field is displayed only if it is among the defined block fields and, if it is private, the user has appropriate permissions.
+            if (isset($use_fields[$record->name]) && $use_fields[$record->name]) {
+              $fields[] = $record;
+            }
+          }
+        }
+
+        if ($fields) {
+          $fields = _profile_update_user_fields($fields, $account);
+          $output .= theme('profile_block', $account, $fields, true);
+        }
+
+        if (isset($use_fields['user_profile']) && $use_fields['user_profile']) {
+          $output .= '
                          ' . l(t('View full user profile'), 'user/' . $account->uid) . '
                          ';
+        }
+      }
+
+      if ($output) {
+         $block['subject'] = t('About %name', array('%name' => $account->name));
+         $block['content'] = $output;
+         return $block;
+      }
+    }
+  }
+}
+
+/**
+ * Implementation of hook_user().
+ */
+function profile_user($type, &$edit, &$user, $category = NULL) {
+  switch ($type) {
+    case 'load':
+      return profile_load_profile($user);
+    case 'register':
+      return profile_form_profile($edit, $user, $category);
+    case 'update':
+    case 'insert':
+      return profile_save_profile($edit, $user, $category);
+    case 'view':
+      return profile_view_profile($user);
+    case 'form':
+      return profile_form_profile($edit, $user, $category);
+    case 'validate':
+      return profile_validate_profile($edit, $category);
+    case 'categories':
+      return profile_categories();
+    case 'delete':
+      db_query('DELETE FROM {profile_values} WHERE uid = %d', $user->uid);
+  }
+}
+
+/**
+ * Menu callback: Generate a form to add/edit a user profile field.
+ */
+function profile_field_form($arg = NULL) {
+  if (arg(3) == 'edit') {
+    if (is_numeric($arg)) {
+      $fid = $arg;
+
+      $edit = db_fetch_array(db_query('SELECT * FROM {profile_fields} WHERE fid = %d', $fid));
+
+      if (!$edit) {
+        drupal_not_found();
+        return;
+      }
+      drupal_set_title(t('edit %title', array('%title' => $edit['title'])));
+      $form['fid'] = array('#type' => 'value',
+        '#value' => $fid,
+      );
+      $type = $edit['type'];
+    }
+    else {
+      drupal_not_found();
+      return;
+    }
+  }
+  else {
+    $types = _profile_field_types();
+    if (!isset($types[$arg])) {
+      drupal_not_found();
+      return;
+    }
+    $type = $arg;
+    drupal_set_title(t('add new %type', array('%type' => $types[$type])));
+    $edit = array('name' => 'profile_');
+    $form['type'] = array('#type' => 'value', '#value' => $type);
+  }
+  $form['fields'] = array('#type' => 'fieldset',
+    '#title' => t('Field settings'),
+  );
+  $form['fields']['category'] = array('#type' => 'textfield',
+    '#title' => t('Category'),
+    '#default_value' => $edit['category'],
+    '#description' => t('The category the new field should be part of. Categories are used to group fields logically. An example category is "Personal information".'),
+    '#required' => TRUE,
+  );
+  $form['fields']['title'] = array('#type' => 'textfield',
+    '#title' => t('Title'),
+    '#default_value' => $edit['title'],
+    '#description' => t('The title of the new field. The title will be shown to the user. An example title is "Favorite color".'),
+    '#required' => TRUE,
+  );
+  $form['fields']['name'] = array('#type' => 'textfield',
+    '#title' => t('Form name'),
+    '#default_value' => $edit['name'],
+    '#description' => t('The name of the field. The form name is not shown to the user but used internally in the HTML code and URLs.
+Unless you know what you are doing, it is highly recommended that you prefix the form name with profile_ to avoid name clashes with other fields. Spaces or any other special characters except dash (-) and underscore (_) are not allowed. An example name is "profile_favorite_color" or perhaps just "profile_color".'),
+    '#required' => TRUE,
+  );
+  $form['fields']['explanation'] = array('#type' => 'textarea',
+    '#title' => t('Explanation'),
+    '#default_value' => $edit['explanation'],
+    '#description' => t('An optional explanation to go with the new field. The explanation will be shown to the user.'),
+  );
+  if ($type == 'selection') {
+    $form['fields']['options'] = array('#type' => 'textarea',
+      '#title' => t('Selection options'),
+      '#default_value' => $edit['options'],
+      '#description' => t('A list of all options. Put each option on a separate line. Example options are "red", "blue", "green", etc.'),
+    );
+  }
+  $form['fields']['weight'] = array('#type' => 'weight',
+    '#title' => t('Weight'),
+    '#default_value' => $edit['weight'],
+    '#delta' => 5,
+    '#description' => t('The weights define the order in which the form fields are shown. Lighter fields "float up" towards the top of the category.'),
+  );
+  $form['fields']['visibility'] = array('#type' => 'radios',
+    '#title' => t('Visibility'),
+    '#default_value' => isset($edit['visibility']) ? $edit['visibility'] : PROFILE_PUBLIC,
+    '#options' => array(PROFILE_HIDDEN => t('Hidden profile field, only accessible by administrators, modules and themes.'), PROFILE_PRIVATE => t('Private field, content only available to privileged users.'), PROFILE_PUBLIC => t('Public field, content shown on profile page but not used on member list pages.'), PROFILE_PUBLIC_LISTINGS => t('Public field, content shown on profile page and on member list pages.')),
+  );
+  if ($type == 'selection' || $type == 'list' || $type == 'textfield') {
+    $form['fields']['page'] = array('#type' => 'textfield',
+      '#title' => t('Page title'),
+      '#default_value' => $edit['page'],
+      '#description' => t('To enable browsing this field by value, enter a title for the resulting page. The word %value will be substituted with the corresponding value. An example page title is "People whose favorite color is %value". This is only applicable for a public field.'),
+    );
+  }
+  else if ($type == 'checkbox') {
+    $form['fields']['page'] = array('#type' => 'textfield',
+      '#title' => t('Page title'),
+      '#default_value' => $edit['page'],
+      '#description' => t('To enable browsing this field by value, enter a title for the resulting page. An example page title is "People who are employed". This is only applicable for a public field.'),
+    );
+  }
+  $form['fields']['required'] = array('#type' => 'checkbox',
+    '#title' => t('The user must enter a value.'),
+    '#default_value' => $edit['required'],
+  );
+  $form['fields']['register'] = array('#type' => 'checkbox',
+    '#title' => t('Visible in user registration form.'),
+    '#default_value' => $edit['register'],
+  );
+  $form['submit'] = array('#type' => 'submit',
+    '#value' => t('Save field'),
+  );
+  return drupal_get_form('profile_field_form', $form);
+}
+
+/**
+ * Validate profile_field_form submissions.
+ */
+function profile_field_form_validate($form_id, $form_values) {
+  // Validate the 'field name':
+  if (eregi('[^a-z0-9_-]', $form_values['name'])) {
+    form_set_error('name', t('The specified form name contains one or more illegal characters. Spaces or any other special characters expect dash (-) and underscore (_) are not allowed.'));
+  }
+
+  if (in_array($form_values['name'], user_fields())) {
+    form_set_error('name', t('The specified form name is reserved for use by Drupal.'));
+  }
+  // Validate the category:
+  if (!$form_values['category']) {
+    form_set_error('category', t('You must enter a category.'));
+  }
+  if ($form_values['category'] == 'account') {
+    form_set_error('category', t('The specified category name is reserved for use by Drupal.'));
+  }
+  $args1 = array($form_values['title'], $form_values['category']);
+  $args2 = array($form_values['name']);
+  $query_suffix = '';
+
+  if (isset($form_values['fid'])) {
+    $args1[] = $args2[] = $form_values['fid'];
+    $query_suffix = ' AND fid != %d';
+  }
+
+  if (db_result(db_query("SELECT fid FROM {profile_fields} WHERE title = '%s' AND category = '%s'". $query_suffix, $args1))) {
+    form_set_error('title', t('The specified title is already in use.'));
+  }
+  if (db_result(db_query("SELECT fid FROM {profile_fields} WHERE name = '%s'". $query_suffix, $args2))) {
+    form_set_error('name', t('The specified name is already in use.'));
+  }
+}
+
+/**
+ * Process profile_field_form submissions.
+ */
+function profile_field_form_submit($form_id, $form_values) {
+  if (!isset($form_values['fid'])) {
+    db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, register, visibility, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s')", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['type'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['options'], $form_values['page']);
+
+    drupal_set_message(t('The field has been created.'));
+    watchdog('profile', t('Profile field %field added under category %category.', array('%field' => theme('placeholder', $form_values['title']), '%category' => theme('placeholder', $form_values['category']))), WATCHDOG_NOTICE, l(t('view'), 'admin/settings/profile'));
+  }
+  else {
+    db_query("UPDATE {profile_fields} SET title = '%s', name = '%s', explanation = '%s', category = '%s', weight = %d, required = %d, register = %d, visibility = %d, options = '%s', page = '%s' WHERE fid = %d", $form_values['title'], $form_values['name'], $form_values['explanation'], $form_values['category'], $form_values['weight'], $form_values['required'], $form_values['register'], $form_values['visibility'], $form_values['options'], $form_values['page'], $form_values['fid']);
+
+    drupal_set_message(t('The field has been updated.'));
+  }
+  cache_clear_all();
+
+  return 'admin/settings/profile';
+}
+
+/**
+ * Menu callback; deletes a field from all user profiles.
+ */
+function profile_field_delete($fid) {
+  $field = db_fetch_object(db_query("SELECT title FROM {profile_fields} WHERE fid = %d", $fid));
+  if (!$field) {
+    drupal_not_found();
+    return;
+  }
+  $form['fid'] = array('#type' => 'value', '#value' => $fid);
+  $form['title'] = array('#type' => 'value', '#value' => $field->title);
+
+  return confirm_form('profile_field_delete', $form, t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))), 'admin/settings/profile', t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to edit this field and change it to a %hidden-field so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid), '%hidden-field' => theme('placeholder', t('hidden profile field')))), t('Delete'), t('Cancel'));
+}
+
+/**
+ * Process a field delete form submission.
+ */
+function profile_field_delete_submit($form_id, $form_values) {
+  db_query('DELETE FROM {profile_fields} WHERE fid = %d', $form_values['fid']);
+  db_query('DELETE FROM {profile_values} WHERE fid = %d', $form_values['fid']);
+
+  cache_clear_all();
+
+  drupal_set_message(t('The field %field has been deleted.', array('%field' => theme('placeholder', $form_values['title']))));
+  watchdog('profile', t('Profile field %field deleted.', array('%field' => theme('placeholder', $form_values['title']))), WATCHDOG_NOTICE, l(t('view'), 'admin/settings/profile'));
+
+  return 'admin/settings/profile';
+}
+
+/**
+ * Menu callback; display a listing of all editable profile fields.
+ */
+function profile_admin_overview() {
+
+  $result = db_query('SELECT * FROM {profile_fields} ORDER BY category, weight');
+  $rows = array();
+  while ($field = db_fetch_object($result)) {
+    $rows[] = array(check_plain($field->title), $field->name, _profile_field_types($field->type), $field->category, l(t('edit'), "admin/settings/profile/edit/$field->fid"), l(t('delete'), "admin/settings/profile/delete/$field->fid"));
+  }
+  if (count($rows) == 0) {
+    $rows[] = array(array('data' => t('No fields defined.'), 'colspan' => '6'));
+  }
+
+  $header = array(t('Title'), t('Name'), t('Type'), t('Category'), array('data' => t('Operations'), 'colspan' => '2'));
+
+  $output  = theme('table', $header, $rows);
+  $output .= '
                          '. t('Add new field') .'
                          ';
+  $output .= '
                            ';
+  foreach (_profile_field_types() as $key => $value) {
+    $output .= '
                          • '. l($value, "admin/settings/profile/add/$key") .'
                            • ';
+  }
+  $output .= '
                          ';
+
+  return $output;
+}
+
+/**
+ * Menu callback; display a list of user information.
+ */
+function profile_browse() {
+
+  $name = arg(1);
+  list(,,$value) = explode('/', $_GET['q'], 3);
+
+  $field = db_fetch_object(db_query("SELECT DISTINCT(fid), type, title, page, visibility FROM {profile_fields} WHERE name = '%s'", $name));
+
+  if ($name && $field->fid) {
+    // Only allow browsing of fields that have a page title set.
+    if (empty($field->page)) {
+      drupal_not_found();
+      return;
+    }
+    // Do not allow browsing of private fields by non-admins.
+    if (!user_access('administer users') && $field->visibility == PROFILE_PRIVATE) {
+       drupal_access_denied();
+       return;
+    }
+
+    // Compile a list of fields to show.
+    $fields = array();
+    $result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE fid != %d AND visibility = %d ORDER BY weight', $field->fid, PROFILE_PUBLIC_LISTINGS);
+    while ($record = db_fetch_object($result)) {
+      $fields[] = $record;
+    }
+
+    // Determine what query to use:
+    $arguments = array($field->fid);
+    switch ($field->type) {
+      case 'checkbox':
+        $query = 'v.value = 1';
+        break;
+      case 'textfield':
+      case 'selection':
+        $query = "v.value = '%s'";
+        $arguments[] = $value;
+        break;
+      case 'list':
+        $query = "v.value LIKE '%%%s%%'";
+        $arguments[] = $value;
+        break;
+      default:
+        drupal_not_found();
+        return;
+    }
+
+    // Extract the affected users:
+    $result = pager_query("SELECT u.uid, u.access FROM {users} u INNER JOIN {profile_values} v ON u.uid = v.uid WHERE v.fid = %d AND $query ORDER BY u.access DESC", 20, 0, NULL, $arguments);
+
+    $output = '
                          ';
+    while ($account = db_fetch_object($result)) {
+      $account = user_load(array('uid' => $account->uid));
+      $profile = _profile_update_user_fields($fields, $account);
+      $output .= theme('profile_listing', $account, $profile);
+    }
+    $output .= theme('pager', NULL, 20);
+
+    if ($field->type == 'selection' || $field->type == 'list' || $field->type == 'textfield') {
+      $title = strtr($field->page, array('%value' => theme('placeholder', $value)));
+    }
+    else {
+      $title = $field->page;
+    }
+    $output .= '
                          ';
+
+    drupal_set_title($title);
+    return $output;
+  }
+  else if ($name && !$field->fid) {
+    drupal_not_found();
+  }
+  else {
+    // Compile a list of fields to show.
+    $fields = array();
+    $result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY category, weight', PROFILE_PUBLIC_LISTINGS);
+    while ($record = db_fetch_object($result)) {
+      $fields[] = $record;
+    }
+
+    // Extract the affected users:
+    $result = pager_query("SELECT uid, access FROM {users} WHERE uid > 0 AND status != 0 ORDER BY access DESC", 20, 0, NULL);
+
+    $output = '
                          ';
+    while ($account = db_fetch_object($result)) {
+      $account = user_load(array('uid' => $account->uid));
+      $profile = _profile_update_user_fields($fields, $account);
+      $output .= theme('profile_listing', $account, $profile);
+    }
+    $output .= '
                          ';
+    $output .= theme('pager', NULL, 20);
+
+    drupal_set_title(t('user list'));
+    return $output;
+  }
+}
+
+function profile_load_profile(&$user) {
+  $result = db_query('SELECT f.name, f.type, v.value FROM {profile_fields} f INNER JOIN {profile_values} v ON f.fid = v.fid WHERE uid = %d', $user->uid);
+  while ($field = db_fetch_object($result)) {
+    if (empty($user->{$field->name})) {
+      $user->{$field->name} = _profile_field_serialize($field->type) ? unserialize($field->value) : $field->value;
+    }
+  }
+}
+
+function profile_save_profile(&$edit, &$user, $category) {
+  if ((arg(0) == 'user' && arg(1) == 'register') || (arg(0) == 'admin' && arg(1) == 'user' && arg(2) == 'create')) {
+    $result = db_query('SELECT fid, name, type FROM {profile_fields} WHERE register = 1 AND visibility != %d ORDER BY category, weight', PROFILE_HIDDEN);
+  }
+  else {
+    $result = db_query("SELECT fid, name, type FROM {profile_fields} WHERE LOWER(category) = LOWER('%s') AND visibility != %d", $category, PROFILE_HIDDEN);
+    // Use LOWER('%s') instead of PHP's strtolower() to avoid UTF-8 conversion issues.
+  }
+  while ($field = db_fetch_object($result)) {
+    if (_profile_field_serialize($field->type)) {
+       $edit[$field->name] = serialize($edit[$field->name]);
+    }
+    db_query("DELETE FROM {profile_values} WHERE fid = %d AND uid = %d", $field->fid, $user->uid);
+    db_query("INSERT INTO {profile_values} (fid, uid, value) VALUES (%d, %d, '%s')", $field->fid, $user->uid, $edit[$field->name]);
+    // Mark field as handled (prevents saving to user->data).
+    $edit[$field->name] = NULL;
+  }
+}
+
+function profile_view_field($user, $field) {
+  // Only allow browsing of private fields for admins, if browsing is enabled,
+  // and if a user has permission to view profiles. Note that this check is
+  // necessary because a user may always see their own profile.
+  $browse = user_access('access user profiles')
+         && (user_access('administer users') || $field->visibility != PROFILE_PRIVATE)
+         && !empty($field->page);
+
+  if ($value = $user->{$field->name}) {
+    switch ($field->type) {
+      case 'textarea':
+        return check_markup($value);
+      case 'textfield':
+      case 'selection':
+        return $browse ? l($value, 'profile/'. $field->name .'/'. $value) : check_plain($value);
+      case 'checkbox':
+        return $browse ? l($field->title, 'profile/'. $field->name) : check_plain($field->title);
+      case 'url':
+        return ''. check_plain($value) .'';
+      case 'date':
+        $format = substr(variable_get('date_format_short', 'm/d/Y - H:i'), 0, 5);
+        // Note: Avoid PHP's date() because it does not handle dates before
+        // 1970 on Windows. This would make the date field useless for e.g.
+        // birthdays.
+        $replace = array('d' => sprintf('%02d', $value['day']),
+                         'j' => $value['day'],
+                         'm' => sprintf('%02d', $value['month']),
+                         'M' => map_month($value['month']),
+                         'Y' => $value['year'],
+                         'H:i' => null,
+                         'g:ia' => null);
+        return strtr($format, $replace);
+      case 'list':
+        $values = split("[,\n\r]", $value);
+        $fields = array();
+        foreach ($values as $value) {
+          if ($value = trim($value)) {
+            $fields[] = $browse ? l($value, 'profile/'. $field->name .'/'. $value) : check_plain($value);
+          }
+        }
+        return implode(', ', $fields);
+    }
+  }
+}
+
+function profile_view_profile($user) {
+
+  profile_load_profile($user);
+
+  // Show private fields to administrators and people viewing their own account.
+  if (user_access('administer users') || $GLOBALS['user']->uid == $user->uid) {
+    $result = db_query('SELECT * FROM {profile_fields} WHERE visibility != %d ORDER BY category, weight', PROFILE_HIDDEN);
+  }
+  else {
+    $result = db_query('SELECT * FROM {profile_fields} WHERE visibility != %d AND visibility != %d ORDER BY category, weight', PROFILE_PRIVATE, PROFILE_HIDDEN);
+  }
+
+  while ($field = db_fetch_object($result)) {
+    if ($value = profile_view_field($user, $field)) {
+      $description = ($field->visibility == PROFILE_PRIVATE) ? t('The content of this field is private and only visible to yourself.') : '';
+      $title = ($field->type != 'checkbox') ? check_plain($field->title) : NULL;
+      $item = array('title' => $title,
+        'value' => $value,
+        'class' => $field->name,
+      );
+      $fields[$field->category][] = $item;
+    }
+  }
+  return $fields;
+}
+
+function _profile_form_explanation($field) {
+  $output = $field->explanation;
+
+  if ($field->type == 'list') {
+    $output .= ' '. t('Put each item on a separate line or separate them by commas. No HTML allowed.');
+  }
+
+  if ($field->visibility == PROFILE_PRIVATE) {
+    $output .= ' '. t('The content of this field is kept private and will not be shown publicly.');
+  }
+
+  return $output;
+}
+
+function profile_form_profile($edit, $user, $category) {
+  if (arg(0) == 'user' && arg(1) == 'register') {
+    $result = db_query('SELECT * FROM {profile_fields} WHERE visibility != %d AND register = 1 ORDER BY category, weight', PROFILE_HIDDEN);
+  }
+  elseif (arg(0) == 'admin' && arg(1) == 'user' && arg(2) == 'create') {
+    $result = db_query('SELECT * FROM {profile_fields} WHERE register = 1 ORDER BY category, weight');
+  }
+  elseif (user_access('administer users')) {
+    $result = db_query("SELECT * FROM {profile_fields} WHERE LOWER(category) = LOWER('%s') ORDER BY weight", $category);
+  }
+  else {
+    $result = db_query("SELECT * FROM {profile_fields} WHERE visibility != %d AND LOWER(category) = LOWER('%s') ORDER BY weight", PROFILE_HIDDEN, $category);
+    // Use LOWER('%s') instead of PHP's strtolower() to avoid UTF-8 conversion issues.
+  }
+
+  while ($field = db_fetch_object($result)) {
+    $category = $field->category;
+    if (!isset($fields[$category])) {
+      $fields[$category] = array('#type' => 'fieldset', '#title' => $category, '#weight' => $w++);
+    }
+    switch ($field->type) {
+      case 'textfield':
+      case 'url':
+        $fields[$category][$field->name] = array('#type' => 'textfield',
+          '#title' => check_plain($field->title),
+          '#default_value' => $edit[$field->name],
+          '#maxlength' => 255,
+          '#description' => _profile_form_explanation($field),
+          '#required' => $field->required,
+        );
+        break;
+      case 'textarea':
+        $fields[$category][$field->name] = array('#type' => 'textarea',
+          '#title' => check_plain($field->title),
+          '#default_value' => $edit[$field->name],
+          '#description' => _profile_form_explanation($field),
+          '#required' => $field->required,
+        );
+        break;
+      case 'list':
+        $fields[$category][$field->name] = array('#type' => 'textarea',
+          '#title' => check_plain($field->title),
+          '#default_value' => $edit[$field->name],
+          '#description' => _profile_form_explanation($field),
+          '#required' => $field->required,
+        );
+        break;
+      case 'checkbox':
+        $fields[$category][$field->name] = array('#type' => 'checkbox',
+          '#title' => check_plain($field->title),
+          '#default_value' => $edit[$field->name],
+          '#description' => _profile_form_explanation($field),
+          '#required' => $field->required,
+        );
+        break;
+      case 'selection':
+        $options = $field->required ? array() : array('--');
+        $lines = split("[,\n\r]", $field->options);
+        foreach ($lines as $line) {
+          if ($line = trim($line)) {
+            $options[$line] = $line;
+          }
+        }
+        $fields[$category][$field->name] = array('#type' => 'select',
+          '#title' => check_plain($field->title),
+          '#default_value' => $edit[$field->name],
+          '#options' => $options,
+          '#description' => _profile_form_explanation($field),
+          '#required' => $field->required,
+        );
+        break;
+      case 'date':
+        $fields[$category][$field->name] = array('#type' => 'date',
+          '#title' => check_plain($field->title),
+          '#default_value' => $edit[$field->name],
+          '#description' => _profile_form_explanation($field),
+          '#required' => $field->required,
+        );
+        break;
+    }
+  }
+  return $fields;
+}
+
+/**
+ * Helper function: update an array of user fields by calling profile_view_field
+ */
+function _profile_update_user_fields($fields, $account) {
+  foreach ($fields as $key => $field) {
+    $fields[$key]->value = profile_view_field($account, $field);
+  }
+  return $fields;
+}
+
+function profile_validate_profile($edit, $category) {
+  if (arg(0) == 'user' && arg(1) == 'register') {
+    $result = db_query('SELECT * FROM {profile_fields} WHERE visibility != %d AND register = 1 ORDER BY category, weight', PROFILE_HIDDEN);
+  }
+  elseif (arg(0) == 'admin' && arg(1) == 'user' && arg(2) == 'create') {
+    $result = db_query('SELECT * FROM {profile_fields} WHERE register = 1 ORDER BY category, weight');
+  }
+  elseif (user_access('administer users')) {
+    $result = db_query("SELECT * FROM {profile_fields} WHERE LOWER(category) = LOWER('%s') ORDER BY weight", $category);
+  }
+  else {
+    $result = db_query("SELECT * FROM {profile_fields} WHERE visibility != %d AND LOWER(category) = LOWER('%s') ORDER BY weight", PROFILE_HIDDEN, $category);
+    // Use LOWER('%s') instead of PHP's strtolower() to avoid UTF-8 conversion issues.
+  }
+
+  while ($field = db_fetch_object($result)) {
+    if ($edit[$field->name]) {
+      if ($field->type == 'url') {
+        if (!valid_url($edit[$field->name], true)) {
+          form_set_error($field->name, t('The value provided for %field is not a valid URL.', array('%field' => theme('placeholder', $field->title))));
+        }
+      }
+    }
+    else if ($field->required && !user_access('administer users')) {
+      form_set_error($field->name, t('The field %field is required.', array('%field' => theme('placeholder', $field->title))));
+    }
+  }
+
+  return $edit;
+}
+
+function profile_categories() {
+  $result = db_query("SELECT DISTINCT(category) FROM {profile_fields}");
+  while ($category = db_fetch_object($result)) {
+    $data[] = array('name' => check_plain($category->category), 'title' => $category->category, 'weight' => 3);
+  }
+  return $data;
+}
+
+function theme_profile_block($account, $fields = array()) {
+
+  $output .= theme('user_picture', $account);
+
+  foreach ($fields as $field) {
+    if ($field->value) {
+      if ($field->type == 'checkbox') {
+        $output .= "
                          $field->value
                          \n";
+      }
+      else {
+        $output .= "
                          $field->title
                          $field->value
                          \n";
+      }
+    }
+  }
+
+  return $output;
+}
+
+function theme_profile_listing($account, $fields = array()) {
+
+  $output  = "
                          \n";
+  $output .= theme('user_picture', $account);
+  $output .= ' 
                          '. theme('username', $account) ."
                          \n";
+
+  foreach ($fields as $field) {
+    if ($field->value) {
+      $output .= " 
                          $field->value
                          \n";
+    }
+  }
+
+  $output .= "
                          \n";
+
+  return $output;
+}
+
+function _profile_field_types($type = NULL) {
+  $types = array('textfield' => t('single-line textfield'),
+                 'textarea' => t('multi-line textfield'),
+                 'checkbox' => t('checkbox'),
+                 'selection' => t('list selection'),
+                 'list' => t('freeform list'),
+                 'url' => t('URL'),
+                 'date' => t('date'));
+  return isset($type) ? $types[$type] : $types;
+}
+
+function _profile_field_serialize($type = NULL) {
+  return $type == 'date';
+}
diff --git a/modules/search.module b/modules/search.module
new file mode 100644
index 0000000..5c4c1e9
--- /dev/null
+++ b/modules/search.module
@@ -0,0 +1,1262 @@
+'. t('The search module adds the ability to search for content by keywords.  Search is often the only practical way to find content on a large site.  Search is useful for finding users and posts by searching on keywords.') .'
                          ';
+      $output .= '
                          '. t('The search engine works by maintaining an index of the words in your site\'s content. It indexes the posts and users.  You can adjust the settings to tweak the indexing behaviour. Note that the search requires cron to be set up correctly.  The index percentage sets the maximum amount of items that will be indexed in one cron run. Set this number lower if your cron is timing out or if PHP is running out of memory.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%admin-help-system' => url('admin/help/system'), '%file-cron' => 'cron.php', '%external-http-drupal-org-node-23714' => 'http://drupal.org/node/23714', '%admin-settings-search' => url('admin/settings/search')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Search page.', array('%search' => 'http://drupal.org/handbook/modules/search/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Enables site-wide keyword searching.');
+    case 'admin/settings/search':
+      return t('
+
                          The search engine works by maintaining an index of the words in your site\'s content. You can adjust the settings below to tweak the indexing behaviour. Note that the search requires cron to be set up correctly.
                          
+');
+    case 'search#noresults':
+      return t('
                            
+
                          • Check if your spelling is correct.
                            • 
+
                          • Remove quotes around phrases to match each word individually: "blue smurf" will match less than blue smurf.
                            • 
+
                          • Consider loosening your query with OR: blue smurf will match less than blue OR smurf.
                            • 
+
                          ');
+  }
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function search_perm() {
+  return array('search content', 'administer search');
+}
+
+/**
+ * Implementation of hook_block().
+ */
+function search_block($op = 'list', $delta = 0) {
+  if ($op == 'list') {
+    $blocks[0]['info'] = t('Search form');
+    return $blocks;
+  }
+  else if ($op == 'view' && user_access('search content')) {
+    $block['content'] = search_box('search_block_form');
+    $block['subject'] = t('Search');
+    return $block;
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function search_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'search', 'title' => t('search'),
+      'callback' => 'search_view',
+      'access' => user_access('search content'),
+      'type' => MENU_SUGGESTED_ITEM);
+    $items[] = array('path' => 'admin/settings/search/wipe', 'title' => t('Clear index'),
+      'callback' => 'search_wipe_confirm',
+      'access' => user_access('administer search'),
+      'type' => MENU_CALLBACK);
+  }
+  else if (arg(0) == 'search') {
+    // To remember the user's search keywords when switching across tabs,
+    // we dynamically add the keywords to the search tabs' paths.
+    $keys = search_get_keys();
+    $keys = strlen($keys) ? '/'. $keys : '';
+    foreach (module_list() as $name) {
+      if (module_hook($name, 'search') && $title = module_invoke($name, 'search', 'name')) {
+        $items[] = array('path' => 'search/'. $name . $keys, 'title' => $title,
+          'callback' => 'search_view',
+          'access' => user_access('search content'),
+          'type' => MENU_LOCAL_TASK);
+      }
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_validate().
+ */
+function search_settings_form_validate($form_id, &$form) {
+  if ($_POST['op'] == t('Re-index site')) {
+    drupal_goto('admin/settings/search/wipe');
+  }
+  // If these settings change, the index needs to be rebuilt.
+  if ((variable_get('minimum_word_size', 3) != $form['minimum_word_size']) ||
+      (variable_get('overlap_cjk', true) != $form['overlap_cjk'])) {
+    drupal_set_message(t('The index will be rebuilt.'));
+    search_wipe();
+  }
+}
+
+/**
+ * Menu callback; displays the search module settings page.
+ */
+function search_settings() {
+  // Collect some stats
+  $remaining = 0;
+  $total = 0;
+  foreach (module_list() as $module) {
+    if (module_hook($module, 'search')) {
+      $status = module_invoke($module, 'search', 'status');
+      $remaining += $status['remaining'];
+      $total += $status['total'];
+    }
+  }
+  $count = format_plural($remaining, 'There is 1 item left to index.', 'There are %count items left to index.');
+  $percentage = ((int)min(100, 100 * ($total - $remaining) / max(1, $total))) . '%';
+  $status = '
                          '. t('%percentage of the site has been indexed.', array('%percentage' => $percentage)) .' '. $count .'
                          ';
+  $form['status'] = array('#type' => 'fieldset', '#title' => t('Indexing status'));
+  $form['status']['status'] = array('#type' => 'markup', '#value' => $status);
+  $form['status']['wipe'] = array('#type' => 'submit', '#value' => t('Re-index site'));
+
+  $items = drupal_map_assoc(array(10, 20, 50, 100, 200, 500));
+
+  // Indexing throttle:
+  $form['indexing_throttle'] = array('#type' => 'fieldset', '#title' => t('Indexing throttle'));
+  $form['indexing_throttle']['search_cron_limit'] = array('#type' => 'select', '#title' => t('Items to index per cron run'), '#default_value' => variable_get('search_cron_limit', 100), '#options' => $items, '#description' => t('The maximum amount of items that will be indexed in one cron run. Set this number lower if your cron is timing out or if PHP is running out of memory.'));
+  // Indexing settings:
+  $form['indexing_settings'] = array('#type' => 'fieldset', '#title' => t('Indexing settings'));
+  $form['indexing_settings']['info'] = array('#type' => 'markup', '#value' => ''. t('
                          Changing the settings below will cause the site index to be rebuilt. The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed.
                          The default settings should be appropriate for the majority of sites.
                          ') .'                          ');
+  $form['indexing_settings']['minimum_word_size'] = array('#type' => 'textfield', '#title' => t('Minimum word length to index'), '#default_value' => variable_get('minimum_word_size', 3), '#size' => 5, '#maxlength' => 3, '#description' => t('The number of characters a word has to be to be indexed. A lower setting means better search result ranking, but also a larger database. Each search query must contain at least one keyword that is this size (or longer).'));
+  $form['indexing_settings']['overlap_cjk'] = array('#type' => 'checkbox', '#title' => t('Simple CJK handling'), '#default_value' => variable_get('overlap_cjk', true), '#description' => t('Whether to apply a simple Chinese/Japanese/Korean tokenizer based on overlapping sequences. Turn this off if you want to use an external preprocessor for this instead. Does not affect other languages.'));
+
+  // Per module settings
+  $form = array_merge($form, module_invoke_all('search', 'admin'));
+  return $form;
+}
+
+/**
+ * Menu callback: confirm wiping of the index.
+ */
+function search_wipe_confirm() {
+  return confirm_form('search_wipe_confirm', $form, t('Are you sure you want to re-index the site?'),
+                  'admin/settings/search', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel'));
+}
+
+/**
+ * Handler for wipe confirmation
+ */
+function search_wipe_confirm_submit($form_id, &$form) {
+  if ($form['confirm']) {
+    search_wipe();
+    drupal_set_message(t('The index will be rebuilt.'));
+    return 'admin/settings/search';
+  }
+}
+
+/**
+ * Wipes a part of or the entire search index.
+ *
+ * @param $sid
+ *  (optional) The SID of the item to wipe. If specified, $type must be passed
+ *  too.
+ * @param $type
+ *  (optional) The type of item to wipe.
+ */
+function search_wipe($sid = NULL, $type = NULL, $reindex = FALSE) {
+  if ($type == NULL && $sid == NULL) {
+    module_invoke_all('search', 'reset');
+  }
+  else {
+    db_query("DELETE FROM {search_dataset} WHERE sid = %d AND type = '%s'", $sid, $type);
+    db_query("DELETE FROM {search_index} WHERE fromsid = %d AND fromtype = '%s'", $sid, $type);
+    // When re-indexing, keep link references
+    db_query("DELETE FROM {search_index} WHERE sid = %d AND type = '%s'". ($reindex ? " AND fromsid = 0" : ''), $sid, $type);
+  }
+}
+
+/**
+ * Marks a word as dirty (or retrieves the list of dirty words). This is used
+ * during indexing (cron). Words which are dirty have outdated total counts in
+ * the search_total table, and need to be recounted.
+ */
+function search_dirty($word = null) {
+  static $dirty = array();
+  if ($word !== null) {
+    $dirty[$word] = true;
+  }
+  else {
+    return $dirty;
+  }
+}
+
+/**
+ * Implementation of hook_cron().
+ *
+ * Fires hook_update_index() in all modules and cleans up dirty words (see
+ * search_dirty).
+ */
+function search_cron() {
+  // We register a shutdown function to ensure that search_total is always up
+  // to date.
+  register_shutdown_function('search_update_totals');
+
+  // Update word index
+  foreach (module_list() as $module) {
+    module_invoke($module, 'update_index');
+  }
+}
+
+/**
+ * This function is called on shutdown to ensure that search_total is always
+ * up to date (even if cron times out or otherwise fails).
+ */
+function search_update_totals() {
+  // Update word IDF (Inverse Document Frequency) counts for new/changed words
+  foreach (search_dirty() as $word => $dummy) {
+    // Get total count
+    $total = db_result(db_query("SELECT SUM(score) FROM {search_index} WHERE word = '%s'", $word));
+    // Apply Zipf's law to equalize the probability distribution
+    $total = log10(1 + 1/(max(1, $total)));
+    db_query("UPDATE {search_total} SET count = %f WHERE word = '%s'", $total, $word);
+    if (!db_affected_rows()) {
+      db_query("INSERT INTO {search_total} (word, count) VALUES ('%s', %f)", $word, $total);
+    }
+  }
+  // Find words that were deleted from search_index, but are still in
+  // search_total. We use a LEFT JOIN between the two tables and keep only the
+  // rows which fail to join.
+  $result = db_query("SELECT t.word AS realword, i.word FROM {search_total} t LEFT JOIN {search_index} i ON t.word = i.word WHERE i.word IS NULL");
+  while ($word = db_fetch_object($result)) {
+    db_query("DELETE FROM {search_total} WHERE word = '%s'", $word->realword);
+  }
+}
+
+/**
+ * Simplifies a string according to indexing rules.
+ */
+function search_simplify($text) {
+  // Decode entities to UTF-8
+  $text = decode_entities($text);
+
+  // Lowercase
+  $text = drupal_strtolower($text);
+
+  // Call an external processor for word handling.
+  search_preprocess($text);
+
+  // Simple CJK handling
+  if (variable_get('overlap_cjk', true)) {
+    $text = preg_replace_callback('/['. PREG_CLASS_CJK .']+/u', 'search_expand_cjk', $text);
+  }
+
+  // To improve searching for numerical data such as dates, IP addresses
+  // or version numbers, we consider a group of numerical characters
+  // separated only by punctuation characters to be one piece.
+  // This also means that searching for e.g. '20/03/1984' also returns
+  // results with '20-03-1984' in them.
+  // Readable regexp: ([number]+)[punctuation]+(?=[number])
+  $text = preg_replace('/(['. PREG_CLASS_NUMBERS .']+)['. PREG_CLASS_PUNCTUATION .']+(?=['. PREG_CLASS_NUMBERS .'])/u', '\1', $text);
+
+  // The dot, underscore and dash are simply removed. This allows meaningful
+  // search behaviour with acronyms and URLs.
+  $text = preg_replace('/[._-]+/', '', $text);
+
+  // With the exception of the rules above, we consider all punctuation,
+  // marks, spacers, etc, to be a word boundary.
+  $text = preg_replace('/['. PREG_CLASS_SEARCH_EXCLUDE . ']+/u', ' ', $text);
+
+  return $text;
+}
+
+/**
+ * Basic CJK tokenizer. Simply splits a string into consecutive, overlapping
+ * sequences of characters ('minimum_word_size' long).
+ */
+function search_expand_cjk($matches) {
+  $min = variable_get('minimum_word_size', 3);
+  $str = $matches[0];
+  $l = drupal_strlen($str);
+  // Passthrough short words
+  if ($l <= $min) {
+    return ' '. $str .' ';
+  }
+  $tokens = ' ';
+  // FIFO queue of characters
+  $chars = array();
+  // Begin loop
+  for ($i = 0; $i < $l; ++$i) {
+    // Grab next character
+    $current = drupal_substr($str, 0, 1);
+    $str = substr($str, strlen($current));
+    $chars[] = $current;
+    if ($i >= $min - 1) {
+      $tokens .= implode('', $chars) .' ';
+      array_shift($chars);
+    }
+  }
+  return $tokens;
+}
+
+/**
+ * Splits a string into tokens for indexing.
+ */
+function search_index_split($text) {
+  static $last = null;
+  static $lastsplit = null;
+
+  if ($last == $text) {
+    return $lastsplit;
+  }
+  // Process words
+  $text = search_simplify($text);
+  $words = explode(' ', $text);
+  array_walk($words, '_search_index_truncate');
+
+  // Save last keyword result
+  $last = $text;
+  $lastsplit = $words;
+
+  return $words;
+}
+
+/**
+ * Helper function for array_walk in search_index_split.
+ */
+function _search_index_truncate(&$text) {
+  $text = truncate_utf8($text, 50);
+}
+
+/**
+ * Invokes hook_search_preprocess() in modules.
+ */
+function search_preprocess(&$text) {
+  foreach (module_implements('search_preprocess') as $module) {
+    $text = module_invoke($module, 'search_preprocess', $text);
+  }
+}
+
+/**
+ * Update the full-text search index for a particular item.
+ *
+ * @param $sid
+ *   A number identifying this particular item (e.g. node id).
+ *
+ * @param $type
+ *   A string defining this type of item (e.g. 'node')
+ *
+ * @param $text
+ *   The content of this item. Must be a piece of HTML text.
+ *
+ * @ingroup search
+ */
+function search_index($sid, $type, $text) {
+  $minimum_word_size = variable_get('minimum_word_size', 3);
+
+  // Link matching
+  global $base_url;
+  $node_regexp = '@href=[\'"]?(?:'. preg_quote($base_url, '@') .'/|'. preg_quote(base_path(), '@') .')(?:\?q=)?/?((?![a-z]+:)[^\'">]+)[\'">]@i';
+
+  // Multipliers for scores of words inside certain HTML tags.
+  // Note: 'a' must be included for link ranking to work.
+  $tags = array('h1' => 25,
+                'h2' => 18,
+                'h3' => 15,
+                'h4' => 12,
+                'h5' => 9,
+                'h6' => 6,
+                'u' => 3,
+                'b' => 3,
+                'i' => 3,
+                'strong' => 3,
+                'em' => 3,
+                'a' => 10);
+
+  // Strip off all ignored tags to speed up processing, but insert space before/after
+  // them to keep word boundaries.
+  $text = str_replace(array('<', '>'), array(' <', '> '), $text);
+  $text = strip_tags($text, '<'. implode('><', array_keys($tags)) .'>');
+
+  // Split HTML tags from plain text.
+  $split = preg_split('/\s*<([^>]+?)>\s*/', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+  // Note: PHP ensures the array consists of alternating delimiters and literals
+  // and begins and ends with a literal (inserting $null as required).
+
+  $tag = false; // Odd/even counter. Tag or no tag.
+  $link = false; // State variable for link analyser
+  $score = 1; // Starting score per word
+  $accum = ' '; // Accumulator for cleaned up data
+  $tagstack = array(); // Stack with open tags
+  $tagwords = 0; // Counter for consecutive words
+  $focus = 1; // Focus state
+
+  $results = array(0 => array()); // Accumulator for words for index
+
+  foreach ($split as $value) {
+    if ($tag) {
+      // Increase or decrease score per word based on tag
+      list($tagname) = explode(' ', $value, 2);
+      $tagname = drupal_strtolower($tagname);
+      // Closing or opening tag?
+      if ($tagname[0] == '/') {
+        $tagname = substr($tagname, 1);
+        // If we encounter unexpected tags, reset score to avoid incorrect boosting.
+        if (!count($tagstack) || $tagstack[0] != $tagname) {
+          $tagstack = array();
+          $score = 1;
+        }
+        else {
+          // Remove from tag stack and decrement score
+          $score = max(1, $score - $tags[array_shift($tagstack)]);
+        }
+        if ($tagname == 'a') {
+          $link = false;
+        }
+      }
+      else {
+        if ($tagstack[0] == $tagname) {
+          // None of the tags we look for make sense when nested identically.
+          // If they are, it's probably broken HTML.
+          $tagstack = array();
+          $score = 1;
+        }
+        else {
+          // Add to open tag stack and increment score
+          array_unshift($tagstack, $tagname);
+          $score += $tags[$tagname];
+        }
+        if ($tagname == 'a') {
+          // Check if link points to a node on this site
+          if (preg_match($node_regexp, $value, $match)) {
+            $path = drupal_get_normal_path($match[1]);
+            if (preg_match('!(?:node|book)/(?:view/)?([0-9]+)!i', $path, $match)) {
+              $linknid = $match[1];
+              if ($linknid > 0) {
+                // Note: ignore links to uncachable nodes to avoid redirect bugs.
+                $node = db_fetch_object(db_query('SELECT n.title, n.nid, n.vid, r.format FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid WHERE n.nid = %d', $linknid));
+                if (filter_format_allowcache($node->format)) {
+                  $link = true;
+                  $linktitle = $node->title;
+                }
+              }
+            }
+          }
+        }
+      }
+      // A tag change occurred, reset counter.
+      $tagwords = 0;
+    }
+    else {
+      // Note: use of PREG_SPLIT_DELIM_CAPTURE above will introduce empty values
+      if ($value != '') {
+        if ($link) {
+          // Check to see if the node link text is its URL. If so, we use the target node title instead.
+          if (preg_match('!^https?://!i', $value)) {
+            $value = $linktitle;
+          }
+        }
+        $words = search_index_split($value);
+        foreach ($words as $word) {
+          // Add word to accumulator
+          $accum .= $word .' ';
+          $num = is_numeric($word);
+          // Check wordlength
+          if ($num || drupal_strlen($word) >= $minimum_word_size) {
+            // Normalize numbers
+            if ($num) {
+              $word = (int)ltrim($word, '-0');
+            }
+
+            if ($link) {
+              if (!isset($results[$linknid])) {
+                $results[$linknid] = array();
+              }
+              $results[$linknid][$word] += $score * $focus;
+            }
+            else {
+              $results[0][$word] += $score * $focus;
+              // Focus is a decaying value in terms of the amount of unique words up to this point.
+              // From 100 words and more, it decays, to e.g. 0.5 at 500 words and 0.3 at 1000 words.
+              $focus = min(1, .01 + 3.5 / (2 + count($results[0]) * .015));
+            }
+          }
+          $tagwords++;
+          // Too many words inside a single tag probably mean a tag was accidentally left open.
+          if (count($tagstack) && $tagwords >= 15) {
+            $tagstack = array();
+            $score = 1;
+          }
+        }
+      }
+    }
+    $tag = !$tag;
+  }
+
+  search_wipe($sid, $type, TRUE);
+
+  // Insert cleaned up data into dataset
+  db_query("INSERT INTO {search_dataset} (sid, type, data) VALUES (%d, '%s', '%s')", $sid, $type, $accum);
+
+  // Insert results into search index
+  foreach ($results[0] as $word => $score) {
+    db_query("INSERT INTO {search_index} (word, sid, type, score) VALUES ('%s', %d, '%s', %f)", $word, $sid, $type, $score);
+    search_dirty($word);
+  }
+  unset($results[0]);
+
+  // Now insert links to nodes
+  foreach ($results as $nid => $words) {
+    foreach ($words as $word => $score) {
+      db_query("INSERT INTO {search_index} (word, sid, type, fromsid, fromtype, score) VALUES ('%s', %d, '%s', %d, '%s', %f)", $word, $nid, 'node', $sid, $type, $score);
+      search_dirty($word);
+    }
+  }
+}
+
+/**
+ * Extract a module-specific search option from a search query. e.g. 'type:book'
+ */
+function search_query_extract($keys, $option) {
+  if (preg_match('/(^| )'. $option .':([^ ]*)( |$)/i', $keys, $matches)) {
+    return $matches[2];
+  }
+}
+
+/**
+ * Return a query with the given module-specific search option inserted in.
+ * e.g. 'type:book'.
+ */
+function search_query_insert($keys, $option, $value = '') {
+  if (search_query_extract($keys, $option)) {
+    $keys = trim(preg_replace('/(^| )'. $option .':[^ ]*/i', '', $keys));
+  }
+  if ($value != '') {
+    $keys .= ' '. $option .':'. $value;
+  }
+  return $keys;
+}
+
+/**
+ * Parse a search query into SQL conditions.
+ *
+ * We build a query that matches the dataset bodies.
+ */
+function search_parse_query($text) {
+  $keys = array('positive' => array(), 'negative' => array());
+
+  // Tokenize query string
+  preg_match_all('/ (-?)("[^"]+"|[^" ]+)/i', ' '. $text, $matches, PREG_SET_ORDER);
+
+  if (count($matches) < 1) {
+    return NULL;
+  }
+
+  // Classify tokens
+  $or = false;
+  foreach ($matches as $match) {
+    $phrase = false;
+    // Strip off phrase quotes
+    if ($match[2]{0} == '"') {
+      $match[2] = substr($match[2], 1, -1);
+      $phrase = true;
+    }
+    // Simplify keyword according to indexing rules and external preprocessors
+    $words = search_simplify($match[2]);
+    // Re-explode in case simplification added more words, except when matching a phrase
+    $words = $phrase ? array($words) : preg_split('/ /', $words, -1, PREG_SPLIT_NO_EMPTY);
+    // Negative matches
+    if ($match[1] == '-') {
+      $keys['negative'] = array_merge($keys['negative'], $words);
+    }
+    // OR operator: instead of a single keyword, we store an array of all
+    // OR'd keywords.
+    elseif ($match[2] == 'OR' && count($keys['positive'])) {
+      $last = array_pop($keys['positive']);
+      // Starting a new OR?
+      if (!is_array($last)) {
+        $last = array($last);
+      }
+      $keys['positive'][] = $last;
+      $or = true;
+      continue;
+    }
+    // Plain keyword
+    else {
+      if ($or) {
+        // Add to last element (which is an array)
+        $keys['positive'][count($keys['positive']) - 1] = array_merge($keys['positive'][count($keys['positive']) - 1], $words);
+      }
+      else {
+        $keys['positive'] = array_merge($keys['positive'], $words);
+      }
+    }
+    $or = false;
+  }
+
+  // Convert keywords into SQL statements.
+  $query = array();
+  $query2 = array();
+  $arguments = array();
+  $arguments2 = array();
+  $matches = 0;
+  // Positive matches
+  foreach ($keys['positive'] as $key) {
+    // Group of ORed terms
+    if (is_array($key) && count($key)) {
+      $queryor = array();
+      $any = false;
+      foreach ($key as $or) {
+        list($q, $count) = _search_parse_query($or, $arguments2);
+        $any |= $count;
+        if ($q) {
+          $queryor[] = $q;
+          $arguments[] = $or;
+        }
+      }
+      if (count($queryor)) {
+        $query[] = '('. implode(' OR ', $queryor) .')';
+        // A group of OR keywords only needs to match once
+        $matches += ($any > 0);
+      }
+    }
+    // Single ANDed term
+    else {
+      list($q, $count) = _search_parse_query($key, $arguments2);
+      if ($q) {
+        $query[] = $q;
+        $arguments[] = $key;
+        // Each AND keyword needs to match at least once
+        $matches += $count;
+      }
+    }
+  }
+  // Negative matches
+  foreach ($keys['negative'] as $key) {
+    list($q) = _search_parse_query($key, $arguments2, true);
+    if ($q) {
+      $query[] = $q;
+      $arguments[] = $key;
+    }
+  }
+  $query = implode(' AND ', $query);
+
+  // Build word-index conditions for the first pass
+  $query2 = substr(str_repeat("i.word = '%s' OR ", count($arguments2)), 0, -4);
+
+  return array($query, $arguments, $query2, $arguments2, $matches);
+}
+
+/**
+ * Helper function for search_parse_query();
+ */
+function _search_parse_query(&$word, &$scores, $not = false) {
+  $count = 0;
+  // Determine the scorewords of this word/phrase
+  if (!$not) {
+    $split = explode(' ', $word);
+    foreach ($split as $s) {
+      $num = is_numeric($s);
+      if ($num || drupal_strlen($s) >= variable_get('minimum_word_size', 3)) {
+        $s = $num ? ((int)ltrim($s, '-0')) : $s;
+        if (!isset($scores[$s])) {
+          $scores[$s] = $s;
+          $count++;
+        }
+      }
+    }
+  }
+  // Return matching snippet and number of added words
+  return array("d.data ". ($not ? 'NOT ' : '') ."LIKE '%% %s %%'", $count);
+}
+
+/**
+ * Do a query on the full-text search index for a word or words.
+ *
+ * This function is normally only called by each module that support the
+ * indexed search (and thus, implements hook_update_index()).
+ *
+ * Two queries are performed which can be extended by the caller.
+ *
+ * The first query selects a set of possible matches based on the search index
+ * and any extra given restrictions. This is the classic "OR" search.
+ *
+ * SELECT i.type, i.sid, SUM(i.score*t.count) AS relevance
+ * FROM {search_index} i
+ * INNER JOIN {search_total} t ON i.word = t.word
+ * $join1
+ * WHERE $where1 AND (...)
+ * GROUP BY i.type, i.sid
+ *
+ * The second query further refines this set by verifying advanced text
+ * conditions (such as AND, negative or phrase matches), and orders the results
+ * on a the column or expression 'score':
+ *
+ * SELECT i.type, i.sid, $select2
+ * FROM temp_search_sids i
+ * INNER JOIN {search_dataset} d ON i.sid = d.sid AND i.type = d.type
+ * $join2
+ * WHERE (...)
+ * ORDER BY score DESC
+ *
+ * @param $keywords
+ *   A search string as entered by the user.
+ *
+ * @param $type
+ *   A string identifying the calling module.
+ *
+ * @param $join1
+ *   (optional) Inserted into the JOIN part of the first SQL query.
+ *   For example "INNER JOIN {node} n ON n.nid = i.sid".
+ *
+ * @param $where1
+ *   (optional) Inserted into the WHERE part of the first SQL query.
+ *   For example "(n.status > %d)".
+ *
+ * @param $arguments1
+ *   (optional) Extra SQL arguments belonging to the first query.
+ *
+ * @param $select2
+ *   (optional) Inserted into the SELECT pat of the second query. Must contain
+ *   a column selected as 'score'.
+ *   defaults to 'i.relevance AS score'
+ *
+ * @param $join2
+ *   (optional) Inserted into the JOIN par of the second SQL query.
+ *   For example "INNER JOIN {node_comment_statistics} n ON n.nid = i.sid"
+ *
+ * @param $arguments2
+ *   (optional) Extra SQL arguments belonging to the second query parameter.
+ *
+ * @param $sort_parameters
+ *   (optional) SQL arguments for sorting the final results.
+ *              Default: 'ORDER BY score DESC'
+ *
+ * @return
+ *   An array of SIDs for the search results.
+ *
+ * @ingroup search
+ */
+function do_search($keywords, $type, $join1 = '', $where1 = '1', $arguments1 = array(), $select2 = 'i.relevance AS score', $join2 = '', $arguments2 = array(), $sort_parameters = 'ORDER BY score DESC') {
+  $query = search_parse_query($keywords);
+
+  if ($query[2] == '') {
+    form_set_error('keys', t('You must include at least one positive keyword with %count characters or more.', array('%count' => variable_get('minimum_word_size', 3))));
+  }
+  if ($query === NULL || $query[0] == '' || $query[2] == '') {
+    return array();
+  }
+
+  // First pass: select all possible matching sids, doing a simple index-based OR matching on the keywords.
+  // 'matches' is used to reject those items that cannot possibly match the query.
+  $conditions = $where1 .' AND ('. $query[2] .") AND i.type = '%s'";
+  $arguments = array_merge($arguments1, $query[3], array($type, $query[4]));
+  $result = db_query_temporary("SELECT i.type, i.sid, SUM(i.score * t.count) AS relevance, COUNT(*) AS matches FROM {search_index} i INNER JOIN {search_total} t ON i.word = t.word $join1 WHERE $conditions GROUP BY i.type, i.sid HAVING COUNT(*) >= %d", $arguments, 'temp_search_sids');
+
+  // Calculate maximum relevance, to normalize it
+  $normalize = db_result(db_query('SELECT MAX(relevance) FROM temp_search_sids'));
+  if (!$normalize) {
+    return array();
+  }
+  $select2 = str_replace('i.relevance', '('. (1.0 / $normalize) .' * i.relevance)', $select2);
+
+  // Second pass: only keep items that match the complicated keywords conditions (phrase search, negative keywords, ...)
+  $conditions = '('. $query[0] .')';
+  $arguments = array_merge($arguments2, $query[1]);
+  $result = db_query_temporary("SELECT i.type, i.sid, $select2 FROM temp_search_sids i INNER JOIN {search_dataset} d ON i.sid = d.sid AND i.type = d.type $join2 WHERE $conditions $sort_parameters", $arguments, 'temp_search_results');
+  if (($count = db_result(db_query('SELECT COUNT(*) FROM temp_search_results'))) == 0) {
+    return array();
+  }
+  $count_query = "SELECT $count";
+
+  // Do actual search query
+  $result = pager_query("SELECT * FROM temp_search_results", 10, 0, $count_query);
+  $results = array();
+  while ($item = db_fetch_object($result)) {
+    $results[] = $item;
+  }
+  return $results;
+}
+
+/**
+ * Helper function for grabbing search keys.
+ */
+function search_get_keys() {
+  // Extract keys as remainder of path
+  // Note: support old GET format of searches for existing links.
+  $path = explode('/', $_GET['q'], 3);
+  return count($path) == 3 ? $path[2] : $_REQUEST['keys'];
+}
+
+/**
+ * Menu callback; presents the search form and/or search results.
+ */
+function search_view() {
+  $type = arg(1);
+
+  // Search form submits with POST but redirects to GET. This way we can keep
+  // the search query URL clean as a whistle:
+  // search/type/keyword+keyword
+  if (!isset($_POST['edit']['form_id'])) {
+    if ($type == '') {
+      // Note: search/node can not be a default tab because it would take on the
+      // path of its parent (search). It would prevent remembering keywords when
+      // switching tabs. This is why we drupal_goto to it from the parent instead.
+      drupal_goto('search/node');
+    }
+
+    $keys = search_get_keys();
+    // Only perform search if there is non-whitespace search term:
+    if (trim($keys)) {
+      // Log the search keys:
+      watchdog('search', t('Search: %keys (%type).', array('%keys' => theme('placeholder', $keys), '%type' => module_invoke($type, 'search', 'name'))), WATCHDOG_NOTICE, l(t('results'), 'search/'. $type .'/'. $keys));
+
+      // Collect the search results:
+      $results = search_data($keys, $type);
+
+      if ($results) {
+        $results = theme('box', t('Search results'), $results);
+      }
+      else {
+        $results = theme('box', t('Your search yielded no results'), search_help('search#noresults'));
+      }
+    }
+
+    // Construct the search form.
+    $output = search_form(NULL, $keys, $type);
+    $output .= $results;
+
+    return $output;
+  }
+
+  return search_form(NULL, $keys, $type);
+}
+
+/**
+ * @defgroup search Search interface
+ * @{
+ * The Drupal search interface manages a global search mechanism.
+ *
+ * Modules may plug into this system to provide searches of different types of
+ * data. Most of the system is handled by search.module, so this must be enabled
+ * for all of the search features to work.
+ *
+ * There are three ways to interact with the search system:
+ * - Specifically for searching nodes, you can implement nodeapi('update index')
+ *   and nodeapi('search result'). However, note that the search system already
+ *   indexes all visible output of a node, i.e. everything displayed normally
+ *   by hook_view() and hook_nodeapi('view'). This is usually sufficient.
+ *   You should only use this mechanism if you want additional, non-visible data
+ *   to be indexed.
+ * - Implement hook_search(). This will create a search tab for your module on
+ *   the /search page with a simple keyword search form. You may optionally
+ *   implement hook_search_item() to customize the display of your results.
+ * - Implement hook_update_index(). This allows your module to use Drupal's
+ *   HTML indexing mechanism for searching full text efficiently.
+ *
+ * If your module needs to provide a more complicated search form, then you need
+ * to implement it yourself without hook_search(). In that case, you should
+ * define it as a local task (tab) under the /search page (e.g. /search/mymodule)
+ * so that users can easily find it.
+ */
+
+/**
+ * Render a search form.
+ *
+ * @param $action
+ *   Form action. Defaults to "search".
+ * @param $keys
+ *   The search string entered by the user, containing keywords for the search.
+ * @param $type
+ *   The type of search to render the node for. Must be the name of module
+ *   which implements hook_search(). Defaults to 'node'.
+ * @param $prompt
+ *   A piece of text to put before the form (e.g. "Enter your keywords")
+ * @return
+ *   An HTML string containing the search form.
+ */
+function search_form($action = '', $keys = '', $type = NULL, $prompt = NULL) {
+  if (!$action) {
+    $action = url('search/'. $type);
+  }
+  if (is_null($prompt)) {
+    $prompt = t('Enter your keywords');
+  }
+
+  $form = array(
+    '#action' => $action,
+    '#attributes' => array('class' => 'search-form'),
+  );
+  $form['module'] = array('#type' => 'value', '#value' => $type);
+  $form['basic'] = array('#type' => 'item', '#title' => $prompt);
+  $form['basic']['inline'] = array('#prefix' => '
                          ', '#suffix' => '
                          ');
+  $form['basic']['inline']['keys'] = array(
+    '#type' => 'textfield',
+    '#title' => '',
+    '#default_value' => $keys,
+    '#size' => $prompt ? 40 : 20,
+    '#maxlength' => 255,
+  );
+  // processed_keys is used to coordinate keyword passing between other forms
+  // that hook into the basic search form.
+  $form['basic']['inline']['processed_keys'] = array('#type' => 'value', '#value' => array());
+  $form['basic']['inline']['submit'] = array('#type' => 'submit', '#value' => t('Search'));
+
+  return drupal_get_form('search_form', $form);
+}
+
+/**
+ * As the search form collates keys from other modules hooked in via
+ * hook_form_alter, the validation takes place in _submit.
+ * search_form_validate() is used solely to set the 'processed_keys' form
+ * value for the basic search form.
+ */
+function search_form_validate($form_id, $form_values, $form) {
+  form_set_value($form['basic']['inline']['processed_keys'], trim($form_values['keys']));
+}
+
+/**
+ * Process a search form submission.
+ */
+function search_form_submit($form_id, $form_values) {
+  $keys = $form_values['processed_keys'];
+  if ($keys == '') {
+    form_set_error('keys', t('Please enter some keywords.'));
+    // Fall through to the drupal_goto() call.
+  }
+
+  $type = $form_values['module'] ? $form_values['module'] : 'node';
+  return 'search/'. $type .'/'. $keys;
+}
+
+/**
+ * Output a search form for the search block and the theme's search box.
+ */
+function search_box($form_id = 'search_theme_form') {
+  // Use search_keys instead of keys to avoid ID conflicts with the search block.
+  $form[$form_id .'_keys'] = array(
+    '#type' => 'textfield',
+    '#size' => 15,
+    '#default_value' => '',
+    '#attributes' => array('title' => t('Enter the terms you wish to search for.')),
+  );
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Search'));
+
+  return drupal_get_form($form_id, $form, 'search_box_form');
+}
+
+/**
+ * Process a block search form submission.
+ */
+function search_box_form_submit($form_id, $form_values) {
+  return 'search/node/'. trim($form_values[$form_id .'_keys']);
+}
+
+/**
+ * Theme the theme search form.
+ */
+function theme_search_theme_form($form) {
+  return '';
+}
+
+/**
+ * Theme the block search form.
+ */
+function theme_search_block_form($form) {
+  return '
                          '. form_render($form) .'
                          ';
+}
+
+/**
+ * Perform a standard search on the given keys, and return the formatted results.
+ */
+function search_data($keys = NULL, $type = 'node') {
+  if (isset($keys)) {
+    if (module_hook($type, 'search')) {
+      $results = module_invoke($type, 'search', 'search', $keys);
+      if (isset($results) && is_array($results) && count($results)) {
+        if (module_hook($type, 'search_page')) {
+          return module_invoke($type, 'search_page', $results);
+        }
+        else {
+          return theme('search_page', $results, $type);
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Returns snippets from a piece of text, with certain keywords highlighted.
+ * Used for formatting search results.
+ *
+ * @param $keys
+ *   A string containing a search query.
+ *
+ * @param $text
+ *   The text to extract fragments from.
+ *
+ * @return
+ *   A string containing HTML for the excerpt.
+ */
+function search_excerpt($keys, $text) {
+  // We highlight around non-indexable or CJK characters.
+  $boundary = '(?:(?<=['. PREG_CLASS_SEARCH_EXCLUDE . PREG_CLASS_CJK .'])|(?=['. PREG_CLASS_SEARCH_EXCLUDE . PREG_CLASS_CJK .']))';
+
+  // Extract positive keywords and phrases
+  preg_match_all('/ ("([^"]+)"|(?!OR)([^" ]+))/', ' '. $keys, $matches);
+  $keys = array_merge($matches[2], $matches[3]);
+
+  // Prepare text
+  $text = ' '. strip_tags(str_replace(array('<', '>'), array(' <', '> '), $text)) .' ';
+  array_walk($keys, '_search_excerpt_replace');
+  $workkeys = $keys;
+
+  // Extract a fragment per keyword for at most 4 keywords.
+  // First we collect ranges of text around each keyword, starting/ending
+  // at spaces.
+  // If the sum of all fragments is too short, we look for second occurrences.
+  $ranges = array();
+  $included = array();
+  $length = 0;
+  while ($length < 256 && count($workkeys)) {
+    foreach ($workkeys as $k => $key) {
+      if (strlen($key) == 0) {
+        unset($workkeys[$k]);
+        unset($keys[$k]);
+        continue;
+      }
+      if ($length >= 256) {
+        break;
+      }
+      // Remember occurrence of key so we can skip over it if more occurrences
+      // are desired.
+      if (!isset($included[$key])) {
+        $included[$key] = 0;
+      }
+      // Locate a keyword (position $p), then locate a space in front (position
+      // $q) and behind it (position $s)
+      if (preg_match('/'. $boundary . $key . $boundary .'/iu', $text, $match, PREG_OFFSET_CAPTURE, $included[$key])) {
+        $p = $match[0][1];
+        if (($q = strpos($text, ' ', max(0, $p - 60))) !== false) {
+          $end = substr($text, $p, 80);
+          if (($s = strrpos($end, ' ')) !== false) {
+            $ranges[$q] = $p + $s;
+            $length += $p + $s - $q;
+            $included[$key] = $p + 1;
+          }
+          else {
+            unset($workkeys[$k]);
+          }
+        }
+        else {
+          unset($workkeys[$k]);
+        }
+      }
+      else {
+        unset($workkeys[$k]);
+      }
+    }
+  }
+
+  // If we didn't find anything, return the beginning.
+  if (count($ranges) == 0) {
+    return truncate_utf8($text, 256) . ' ...';
+  }
+
+  // Sort the text ranges by starting position.
+  ksort($ranges);
+
+  // Now we collapse overlapping text ranges into one. The sorting makes it O(n).
+  $newranges = array();
+  foreach ($ranges as $from2 => $to2) {
+    if (!isset($from1)) {
+      $from1 = $from2;
+      $to1 = $to2;
+      continue;
+    }
+    if ($from2 <= $to1) {
+      $to1 = max($to1, $to2);
+    }
+    else {
+      $newranges[$from1] = $to1;
+      $from1 = $from2;
+      $to1 = $to2;
+    }
+  }
+  $newranges[$from1] = $to1;
+
+  // Fetch text
+  $out = array();
+  foreach ($newranges as $from => $to) {
+    $out[] = substr($text, $from, $to - $from);
+  }
+  $text = (isset($newranges[0]) ? '' : '... '). implode(' ... ', $out) .' ...';
+
+  // Highlight keywords. Must be done at once to prevent conflicts ('strong' and '').
+  $text = preg_replace('/'. $boundary .'('. implode('|', $keys) .')'. $boundary .'/iu', '\0', $text);
+  return $text;
+}
+
+/**
+ * @} End of "defgroup search".
+ */
+
+/**
+ * Helper function for array_walk in search_except.
+ */
+function _search_excerpt_replace(&$text) {
+  $text = preg_quote($text, '/');
+}
+
+/**
+ * Format a single result entry of a search query. This function is normally
+ * called by theme_search_page() or hook_search_page().
+ *
+ * @param $item
+ *   A single search result as returned by hook_search(). The result should be
+ *   an array with keys "link", "title", "type", "user", "date", and "snippet".
+ *   Optionally, "extra" can be an array of extra info to show along with the
+ *   result.
+ * @param $type
+ *   The type of item found, such as "user" or "node".
+ *
+ * @ingroup themeable
+ */
+function theme_search_item($item, $type) {
+  $output = ' 
                          '. check_plain($item['title']) .'
                          ';
+  $info = array();
+  if ($item['type']) {
+    $info[] = $item['type'];
+  }
+  if ($item['user']) {
+    $info[] = $item['user'];
+  }
+  if ($item['date']) {
+    $info[] = format_date($item['date'], 'small');
+  }
+  if (is_array($item['extra'])) {
+    $info = array_merge($info, $item['extra']);
+  }
+  $output .= ' 
                          '. ($item['snippet'] ? '
                          '. $item['snippet'] . '
                          ' : '') . '
                          ' . implode(' - ', $info) .'
                          ';
+  return $output;
+}
+
+/**
+ * Format the result page of a search query.
+ *
+ * Modules may implement hook_search_page() in order to override this default
+ * function to display search results. In that case it is expected they provide
+ * their own themeable functions.
+ *
+ * @param $results
+ *   All search result as returned by hook_search().
+ * @param $type
+ *   The type of item found, such as "user" or "node".
+ *
+ * @ingroup themeable
+ */
+function theme_search_page($results, $type) {
+  $output = '
                          ';
+
+  foreach ($results as $entry) {
+    $output .= theme('search_item', $entry, $type);
+  }
+  $output .= '
                          ';
+  $output .= theme('pager', NULL, 10, 0);
+
+  return $output;
+}
diff --git a/modules/statistics.module b/modules/statistics.module
new file mode 100644
index 0000000..e5a594a
--- /dev/null
+++ b/modules/statistics.module
@@ -0,0 +1,495 @@
+'. t('The statistics module keeps track of numerous statistics of site usage. It counts how many times, and from where each of your posts is viewed. The statistics module can be used to learn many useful things about how users are interacting with each other and with your site.') .'
                          ';
+      $output .= t('
                          Statistics module features
                          
+
                            
+
                          • Logs show statistics for how many times your site and specific content on your site has been accessed.
                            • 
+
                          • Referrers tells you from where visitors came from (referrer URL).
                            • 
+
                          • Top pages shows you what\'s hot, what is the most popular content on your site.
                            • 
+
                          • Top users shows you the most active users for your site.
                            • 
+
                          • Recent hits displays information about the latest activity on your site.
                            • 
+
                          • Node count displays the number of times a node has been accessed in the node\'s link section next to # comments.
                            • 
+
                          • Popular content block creates a block that can display the day\'s top viewed content, the all time top viewed content, and the last content viewed.
                            • 
+
                          
+');
+      $output .= t('
                          Configuring the statistics module
                          
+
                            
+
                          • Enable access log allows you to turn the access log on and off. This log is used to store data about every page accessed, such as the remote host\'s IP address, where they came from (referrer), what node they\'ve viewed, and their user name. Enabling the log adds one database call per page displayed by Drupal.
                            • 
+
                          • Discard access logs older than allows you to configure how long an access log entry is saved, after which time it is deleted from the database table. To use this you need to run cron.php
                            • 
+
                          • Enable node view counter allows you to turn on and off the node-counting functionality of this module. If it is turned on, an extra database query is added for each node displayed, which increments a counter.
                            • 
+
                          
+');
+      $output .= t('
                          You can
                          
+
+', array('%admin-settings-statistics' => url('admin/settings/statistics'), '%admin-logs' => url('admin/logs'), '%admin-logs-hits' => url('admin/logs/hits'), '%admin-block' => url('admin/block')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Statistics page.', array('%statistics' => 'http://drupal.org/handbook/modules/statistics/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Logs access statistics for your site.');
+    case 'admin/settings/statistics':
+      return t('
                          Settings for the statistical information that Drupal will keep about the site. See site statistics for the actual information.
                          ', array('%statistics' => url('admin/logs/hits')));
+    case 'admin/logs/hits':
+      return t('
                          This page shows you the most recent hits.
                          ');
+    case 'admin/logs/referrers':
+      return t('
                          This page shows you all external referrers. These are links pointing to your web site from outside your web site.
                          ');
+    case 'admin/logs/visitors':
+      return t('
                          When you ban a visitor, you prevent his IP address from accessing your site. Unlike blocking a user, banning a visitor works even for anonymous users. The most common use for this is to block bots/web crawlers that are consuming too many resources.
                          ');
+  }
+}
+
+/**
+ * Implementation of hook_exit().
+ *
+ * This is where statistics are gathered on page accesses.
+ */
+function statistics_exit() {
+  global $user, $recent_activity;
+
+  drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH);
+
+  if (variable_get('statistics_count_content_views', 0)) {
+    // We are counting content views.
+    if ((arg(0) == 'node') && is_numeric(arg(1)) && arg(2) == '') {
+      // A node has been viewed, so update the node's counters.
+      db_query('UPDATE {node_counter} SET daycount = daycount + 1, totalcount = totalcount + 1, timestamp = %d WHERE nid = %d', time(), arg(1));
+      // If we affected 0 rows, this is the first time viewing the node.
+      if (!db_affected_rows()) {
+        // We must create a new row to store counters for the new node.
+        db_query('INSERT INTO {node_counter} (nid, daycount, totalcount, timestamp) VALUES (%d, 1, 1, %d)', arg(1), time());
+      }
+    }
+  }
+  if ((variable_get('statistics_enable_access_log', 0)) && (module_invoke('throttle', 'status') == 0)) {
+    // Log this page access.
+    db_query("INSERT INTO {accesslog} (title, path, url, hostname, uid, sid, timer, timestamp) values('%s', '%s', '%s', '%s', %d, '%s', %d, %d)", strip_tags(drupal_get_title()), $_GET['q'], referer_uri(), $_SERVER['REMOTE_ADDR'], $user->uid, session_id(), timer_read('page'), time());
+  }
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function statistics_perm() {
+  return array('access statistics', 'view post access counter');
+}
+
+/**
+ * Implementation of hook_link().
+ */
+function statistics_link($type, $node = 0, $main = 0) {
+  global $id;
+  $links = array();
+
+  if ($type != 'comment' && user_access('view post access counter')) {
+    $statistics = statistics_get($node->nid);
+    if ($statistics) {
+      $links[] = format_plural($statistics['totalcount'], '1 read', '%count reads');
+    }
+  }
+
+  return $links;
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function statistics_menu($may_cache) {
+  $items = array();
+
+  $access = user_access('access statistics');
+  if ($may_cache) {
+    $items[] = array('path' => 'admin/logs/hits', 'title' => t('recent hits'),
+      'callback' => 'statistics_recent_hits', 'access' => $access,
+      'weight' => 3);
+    $items[] = array('path' => 'admin/logs/pages', 'title' => t('top pages'),
+      'callback' => 'statistics_top_pages', 'access' => $access,
+      'weight' => 1);
+    $items[] = array('path' => 'admin/logs/visitors', 'title' => t('top visitors'),
+      'callback' => 'statistics_top_visitors', 'access' => $access,
+      'weight' => 2);
+    $items[] = array('path' => 'admin/logs/referrers', 'title' => t('referrers'),
+      'callback' => 'statistics_top_referrers', 'access' => $access);
+    $items[] = array('path' => 'admin/logs/access', 'title' => t('details'),
+      'callback' => 'statistics_access_log', 'access' => $access,
+      'type' => MENU_CALLBACK);
+  }
+  else {
+    if (arg(0) == 'user' && is_numeric(arg(1)) && variable_get('statistics_enable_access_log', 0)) {
+      $items[] = array('path' => 'user/'. arg(1) .'/track/navigation', 'title' => t('track page visits'),
+        'callback' => 'statistics_user_tracker', 'access' => $access,
+        'type' => MENU_LOCAL_TASK, 'weight' => 2);
+    }
+    if (arg(0) == 'node' && is_numeric(arg(1)) && variable_get('statistics_enable_access_log', 0)) {
+      $items[] = array('path' => 'node/'. arg(1) .'/track', 'title' => t('track'),
+        'callback' => 'statistics_node_tracker', 'access' => $access,
+        'type' => MENU_LOCAL_TASK, 'weight' => 2);
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_user().
+ */
+function statistics_user($op, &$edit, &$user) {
+  if ($op == 'delete') {
+    db_query('UPDATE {accesslog} SET uid = 0 WHERE uid = %d', $user->uid);
+  }
+}
+
+function statistics_access_log($aid) {
+  $result = db_query('SELECT a.*, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid WHERE aid = %d', $aid);
+  if ($access = db_fetch_object($result)) {
+    $output  = '';
+    $output .= ' ";
+    $output .= ' '; // safe because it comes from drupal_get_title()
+    $output .= ' ";
+    $output .= ' ';
+    $output .= ' ';
+    $output .= ' ';
+    $output .= '
                          '. t('URL') ."". l(url($access->path, NULL, NULL, TRUE), $access->path) ."
                          '. t('Title') .''. $access->title .'
                          '. t('Referrer') ."". ($access->url ? l($access->url, $access->url) : '') ."
                          '. t('Date') .''. format_date($access->timestamp, 'large') .'
                          '. t('User') .''. theme('username', $access) .'
                          '. t('Hostname') .''. check_plain($access->hostname) .'
                          ';
+    return $output;
+  }
+  else {
+    drupal_not_found();
+  }
+}
+
+function statistics_node_tracker() {
+  if ($node = node_load(arg(1))) {
+
+    $header = array(
+        array('data' => t('Time'), 'field' => 'a.timestamp', 'sort' => 'desc'),
+        array('data' => t('Referrer'), 'field' => 'a.url'),
+        array('data' => t('User'), 'field' => 'u.name'),
+        array('data' => t('Operations')));
+
+    $result = pager_query('SELECT a.aid, a.timestamp, a.url, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid WHERE a.path LIKE \'node/%d%%\'' . tablesort_sql($header), 30, 0, NULL, $node->nid);
+    while ($log = db_fetch_object($result)) {
+      $rows[] = array(
+        array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
+        _statistics_link($log->url),
+        theme('username', $log),
+        l(t('details'), "admin/logs/access/$log->aid"));
+    }
+
+    drupal_set_title(check_plain($node->title));
+    $output = theme('table', $header, $rows);
+    $output .= theme('pager', NULL, 30, 0);
+    return $output;
+  }
+  else {
+    drupal_not_found();
+  }
+}
+
+function statistics_user_tracker() {
+  if ($account = user_load(array('uid' => arg(1)))) {
+
+    $header = array(
+        array('data' => t('Timestamp'), 'field' => 'timestamp', 'sort' => 'desc'),
+        array('data' => t('Page'), 'field' => 'path'),
+        array('data' => t('Operations')));
+
+    $result = pager_query('SELECT aid, timestamp, path, title FROM {accesslog} WHERE uid = %d' . tablesort_sql($header), 30, 0, NULL, $account->uid);
+    while ($log = db_fetch_object($result)) {
+      $rows[] = array(
+        array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
+        _statistics_format_item($log->title, $log->path),
+        l(t('details'), "admin/logs/access/$log->aid"));
+    }
+
+    drupal_set_title($account->name);
+    $output = theme('table', $header, $rows);
+    $output .= theme('pager', NULL, 30, 0);
+    return $output;
+  }
+  else {
+    drupal_not_found();
+  }
+}
+
+/**
+ * Menu callback; presents the "recent hits" page.
+ */
+function statistics_recent_hits() {
+  $header = array(
+    array('data' => t('Timestamp'), 'field' => 'a.timestamp', 'sort' => 'desc'),
+    array('data' => t('Page'), 'field' => 'a.path'),
+    array('data' => t('User'), 'field' => 'u.name'),
+    array('data' => t('Operations'))
+  );
+
+  $sql = 'SELECT a.aid, a.path, a.title, a.uid, u.name, a.timestamp FROM {accesslog} a LEFT JOIN {users} u ON u.uid = a.uid' . tablesort_sql($header);
+
+  $result = pager_query($sql, 30);
+  while ($log = db_fetch_object($result)) {
+    $rows[] = array(
+      array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
+      _statistics_format_item($log->title, $log->path),
+      theme('username', $log),
+      l(t('details'), "admin/logs/access/$log->aid"));
+  }
+
+  $output = theme('table', $header, $rows);
+  $output .= theme('pager', NULL, 30, 0);
+  return $output;
+}
+
+/**
+ * Menu callback; presents the "top pages" page.
+ */
+function statistics_top_pages() {
+  $sql = "SELECT COUNT(path) AS hits, path, title, AVG(timer) AS average_time, SUM(timer) AS total_time FROM {accesslog} GROUP BY path, title";
+  $sql_cnt = "SELECT COUNT(DISTINCT(path)) FROM {accesslog}";
+
+  $header = array(
+    array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),
+    array('data' => t('Page'), 'field' => 'path'),
+    array('data' => t('Average page generation time'), 'field' => 'average_time'),
+    array('data' => t('Total page generation time'), 'field' => 'total_time')
+  );
+  $sql .= tablesort_sql($header);
+  $result = pager_query($sql, 30, 0, $sql_cnt);
+
+  while ($page = db_fetch_object($result)) {
+    $rows[] = array($page->hits, _statistics_format_item($page->title, $page->path), t('%time ms', array('%time' => round($page->average_time))), format_interval(round($page->total_time / 1000)));
+  }
+
+  drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+  $output = theme('table', $header, $rows);
+  $output .= theme('pager', NULL, 30, 0);
+  return $output;
+}
+
+/**
+ * Menu callback; presents the "top visitors" page.
+ */
+function statistics_top_visitors() {
+
+  $header = array(
+    array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),
+    array('data' => t('Visitor'), 'field' => 'u.name'),
+    array('data' => t('Total page generation time'), 'field' => 'total'),
+    array('data' => t('Operations'))
+  );
+
+  $sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name, a.hostname, SUM(a.timer) AS total, ac.aid FROM {accesslog} a LEFT JOIN {access} ac ON ac.type = 'host' AND LOWER(a.hostname) LIKE (ac.mask) LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.hostname, a.uid, u.name, ac.aid". tablesort_sql($header);
+  $sql_cnt = "SELECT COUNT(DISTINCT(uid)) FROM {accesslog}";
+  $result = pager_query($sql, 30, 0, $sql_cnt);
+
+  while ($account = db_fetch_object($result)) {
+    $qs = drupal_get_destination();
+    $ban_link = $account->aid ? l(t('unban'), "admin/access/rules/delete/$account->aid", array(), $qs) : l(t('ban'), "admin/access/rules/add/$account->hostname/host", array(), $qs);
+    $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), $ban_link);
+  }
+
+  drupal_set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+  $output = theme('table', $header, $rows);
+  $output .= theme('pager', NULL, 30, 0);
+  return $output;
+}
+
+/**
+ * Menu callback; presents the "referrer" page.
+ */
+function statistics_top_referrers() {
+  $query = "SELECT url, COUNT(url) AS hits, MAX(timestamp) AS last FROM {accesslog} WHERE url NOT LIKE '%%%s%%' AND url <> '' GROUP BY url";
+  $query_cnt = "SELECT COUNT(DISTINCT(url)) FROM {accesslog} WHERE url <> '' AND url NOT LIKE '%%%s%%'";
+  drupal_set_title(t('Top referrers in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
+
+  $header = array(
+    array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),
+    array('data' => t('Url'), 'field' => 'url'),
+    array('data' => t('Last visit'), 'field' => 'last'),
+  );
+
+  $query .= tablesort_sql($header);
+  $result = pager_query($query, 30, 0, $query_cnt, $_SERVER['HTTP_HOST']);
+
+  while ($referrer = db_fetch_object($result)) {
+    $rows[] = array($referrer->hits, _statistics_link($referrer->url), t('%time ago', array('%time' => format_interval(time() - $referrer->last))));
+  }
+
+  $output = theme('table', $header, $rows);
+  $output .= theme('pager', NULL, 30, 0);
+  return $output;
+}
+
+/**
+ * Implementation of hook_settings().
+ */
+function statistics_settings() {
+  // access log settings:
+  $options = array('1' => t('Enabled'), '0' => t('Disabled'));
+  $form['access'] = array('#type' => 'fieldset', '#title' => t('Access log settings'));
+  $form['access']['statistics_enable_access_log'] = array('#type' => 'radios', '#title' => t('Enable access log'), '#default_value' =>  variable_get('statistics_enable_access_log', 0), '#options' => $options, '#description' => t('Log each page access.  Required for referrer statistics.'));
+  $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
+  $form['access']['statistics_flush_accesslog_timer'] = array('#type' => 'select', '#title' => t('Discard access logs older than'), '#default_value'   => variable_get('statistics_flush_accesslog_timer', 259200), '#options' => $period, '#description' => t('Older access log entries (including referrer statistics) will be automatically discarded.  Requires crontab.'));
+
+  // count content views settings
+  $form['content'] = array('#type' => 'fieldset', '#title' => t('Content viewing counter settings'));
+  $form['content']['statistics_count_content_views'] = array('#type' => 'radios', '#title' => t('Count content views'), '#default_value' =>  variable_get('statistics_count_content_views', 0), '#options' => $options, '#description' => t('Increment a counter each time content is viewed.'));
+
+  return $form;
+}
+
+/**
+ * Implementation of hook_cron().
+ */
+function statistics_cron() {
+  $statistics_timestamp = variable_get('statistics_day_timestamp', '');
+
+  if ((time() - $statistics_timestamp) >= 86400) {
+    /* reset day counts */
+    db_query('UPDATE {node_counter} SET daycount = 0');
+    variable_set('statistics_day_timestamp', time());
+  }
+
+  /* clean expired access logs */
+  db_query('DELETE FROM {accesslog} WHERE timestamp < %d', time() - variable_get('statistics_flush_accesslog_timer', 259200));
+}
+
+/**
+ * Returns all time or today top or last viewed node(s).
+ *
+ * @param $dbfield
+ *   one of
+ *   - 'totalcount': top viewed content of all time.
+ *   - 'daycount': top viewed content for today.
+ *   - 'timestamp': last viewed node.
+ *
+ * @param $dbrows
+ *   number of rows to be returned.
+ *
+ * @return
+ *   A query result containing n.nid, n.title, u.uid, u.name of the selected node(s)
+ *   or FALSE if the query could not be executed correctly.
+ */
+function statistics_title_list($dbfield, $dbrows) {
+  return db_query_range(db_rewrite_sql("SELECT n.nid, n.title, u.uid, u.name FROM {node} n INNER JOIN {node_counter} s ON n.nid = s.nid INNER JOIN {users} u ON n.uid = u.uid WHERE %s <> '0' AND n.status = 1 ORDER BY %s DESC"), 's.'. $dbfield, 's.'. $dbfield, 0, $dbrows);
+}
+
+
+/**
+ * Retrieves a node's "view statistics".
+ *
+ * @param $nid
+ *   node ID
+ *
+ * @return
+ *   An array with three entries: [0]=totalcount, [1]=daycount, [2]=timestamp
+ *   - totalcount: count of the total number of times that node has been viewed.
+ *   - daycount: count of the total number of times that node has been viewed "today".
+ *     For the daycount to be reset, cron must be enabled.
+ *   - timestamp: timestamp of when that node was last viewed.
+ */
+function statistics_get($nid) {
+
+  if ($nid > 0) {
+    /* retrieves an array with both totalcount and daycount */
+    $statistics = db_fetch_array(db_query('SELECT totalcount, daycount, timestamp FROM {node_counter} WHERE nid = %d', $nid));
+  }
+
+  return $statistics;
+}
+
+/**
+ * Implementation of hook_block().
+ */
+function statistics_block($op = 'list', $delta = 0, $edit = array()) {
+  switch ($op) {
+    case 'list':
+      if (variable_get('statistics_count_content_views', 0)) {
+        $blocks[0]['info'] = t('Popular content');
+      }
+      return $blocks;
+
+    case 'configure':
+      // Popular content block settings
+      $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
+      $form['statistics_block_top_day_num'] = array('#type' => 'select', '#title' => t("Number of day's top views to display"), '#default_value' => variable_get('statistics_block_top_day_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "day" list.'));
+      $form['statistics_block_top_all_num'] = array('#type' => 'select', '#title' => t('Number of all time views to display'), '#default_value' => variable_get('statistics_block_top_all_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "all time" list.'));
+      $form['statistics_block_top_last_num'] = array('#type' => 'select', '#title' => t('Number of most recent views to display'), '#default_value' => variable_get('statistics_block_top_last_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "recently viewed" list.'));
+      return $form;
+
+    case 'save':
+      variable_set('statistics_block_top_day_num', $edit['statistics_block_top_day_num']);
+      variable_set('statistics_block_top_all_num', $edit['statistics_block_top_all_num']);
+      variable_set('statistics_block_top_last_num', $edit['statistics_block_top_last_num']);
+      break;
+
+    case 'view':
+      if (user_access('access content')) {
+        $content = array();
+
+        $daytop = variable_get('statistics_block_top_day_num', 0);
+        if ($daytop && ($result = statistics_title_list('daycount', $daytop)) && db_num_rows($result)) {
+          $content[] = node_title_list($result, t("Today's:"));
+        }
+
+        $alltimetop = variable_get('statistics_block_top_all_num', 0);
+        if ($alltimetop && ($result = statistics_title_list('totalcount', $alltimetop)) && db_num_rows($result)) {
+          $content[] = node_title_list($result, t('All time:'));
+        }
+
+        $lasttop = variable_get('statistics_block_top_last_num', 0);
+        if ($lasttop && ($result = statistics_title_list('timestamp', $lasttop)) && db_num_rows($result)) {
+          $content[] = node_title_list($result, t('Last viewed:'));
+        }
+
+        if (count($content)) {
+          $block['content'] = implode('
                          ', $content);
+          $block['subject'] = t('Popular content');
+          return $block;
+        }
+      }
+  }
+}
+
+/**
+ * It is possible to adjust the width of columns generated by the
+ * statistics module.
+ */
+function _statistics_link($path, $width = 35) {
+  $title = drupal_get_path_alias($path);
+  $title = truncate_utf8($title, $width, FALSE, TRUE);
+  return l($title, $path);
+}
+
+function _statistics_format_item($title, $path) {
+  $path = ($path ? $path : '/');
+  $output  = ($title ? "$title
                          " : '');
+  $output .= _statistics_link($path);
+  return $output;
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ */
+function statistics_nodeapi(&$node, $op, $arg = 0) {
+  switch ($op) {
+    case 'delete':
+      // clean up statistics table when node is deleted
+      db_query('DELETE FROM {node_counter} WHERE nid = %d', $node->nid);
+  }
+}
+
+
diff --git a/modules/story.module b/modules/story.module
new file mode 100644
index 0000000..6c4fb18
--- /dev/null
+++ b/modules/story.module
@@ -0,0 +1,86 @@
+'. t('The story module is used to create a content post type called stories. Stories are articles in their simplest form: they have a title, a teaser and a body. Stories are typically used to post news articles or as a group blog. ') .'
                          ';
+      $output .= '
                          '. t('The story administration interface allows for complex configuration. It provides a submission form, workflow, default view permission, default edit permission, permissions for permission, and attachments.  Trackbacks can also be enabled.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%node-add-story' => url('node/add/story'), '%admin-settings-content-types-story' => url('admin/settings/content-types/story')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Story page.', array('%story' => 'http://drupal.org/handbook/modules/story/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Allows users to submit stories, articles or similar content.');
+    case 'node/add#story':
+      return t('Stories are articles in their simplest form: they have a title, a teaser and a body, but can be extended by other modules. The teaser is part of the body too. Stories may be used as a personal blog or for news articles.');
+  }
+}
+
+/**
+ * Implementation of hook_node_info().
+ */
+function story_node_info() {
+  return array('story' => array('name' => t('story'), 'base' => 'story'));
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function story_perm() {
+  return array('create stories', 'edit own stories');
+}
+
+/**
+ * Implementation of hook_access().
+ */
+function story_access($op, $node) {
+  global $user;
+
+  if ($op == 'create') {
+    return user_access('create stories');
+  }
+
+  if ($op == 'update' || $op == 'delete') {
+    if (user_access('edit own stories') && ($user->uid == $node->uid)) {
+      return TRUE;
+    }
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function story_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'node/add/story', 'title' => t('story'),
+      'access' => user_access('create stories'));
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_form().
+ */
+function story_form(&$node) {
+  $form['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#required' => TRUE, '#default_value' => $node->title, '#weight' => -5);
+  $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#default_value' => $node->body, '#rows' => 20, '#required' => TRUE);
+  $form['body_filter']['format'] = filter_form($node->format);
+  return $form;
+}
+
diff --git a/modules/system.module b/modules/system.module
new file mode 100644
index 0000000..c68bba4
--- /dev/null
+++ b/modules/system.module
@@ -0,0 +1,1272 @@
+'. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency.   The ability to run scheduled jobs makes administering the web site more usable, as administrators do not have to manually start jobs.   The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve web site performance.  The settings module provides control over preferences, behaviours including visual and operational settings.') .'
                          ';
+      $output .= '
                          '. t('Some modules require regularly scheduled actions, such as cleaning up logfiles. Cron, which stands for chronograph, is a periodic command scheduler executing commands at intervals specified in seconds. It can be used to control the execution of daily, weekly and monthly jobs (or anything with a period measured in seconds). The aggregator module periodically updates feeds using cron.  Ping periodically notifies services of new content on your site.  Search periodically indexes the content on your site.   Automating tasks is one of the best ways to keep a system running smoothly, and if most of your administration does not require your direct involvement, cron is an ideal solution.') .'
                          ';
+      $output .= '
                          '. t('There is a caching mechanism which stores dynamically generated web pages in a database. By caching a web page, the system module does not have to create the page each time someone wants to view it, instead it takes only one SQL query to display it, reducing response time and the server\'s load. Only pages requested by anonymous users are cached. In order to reduce server load and save bandwidth, the system module stores and sends cached pages compressed.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%file-cron' => 'cron.php', '%external-http-drupal-org-cron' => 'http://drupal.org/cron', '%admin-settings' => url('admin/settings')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook System page.', array('%system' => 'http://drupal.org/handbook/modules/system/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Handles general site configuration for administrators.');
+    case 'admin':
+      return t('
                          Welcome to the administration section. Below are the most recent system events.
                          ');
+    case 'admin/settings':
+      return t('
                          General configuration options for your site. Set up the name of the site, e-mail address used in mail-outs, clean URL options, caching, etc.
                          ');
+    case 'admin/themes':
+      return t('
                          Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternately, to override these settings in a specific theme, click the "configure" link for the corresponding theme.  Note that different themes may have different regions available for rendering content like blocks.  If you want consistency in what your users see, you may wish to enable only one theme.
                          ');
+    case 'admin/themes/settings':
+      return t('
                          These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.
                          ');
+    case 'admin/themes/settings/'. arg(3):
+      $reference = explode('.', arg(3), 2);
+      $theme = array_pop($reference);
+      return t('
                          These options control the display settings for the %template theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the global settings for this theme.
                          ', array('%template' => $theme, '%global' => url('admin/themes/settings')));
+    case 'admin/modules':
+      return t('
                          Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Click on the name of the module in the navigation menu for their individual configuration pages. Once a module is enabled, new permissions might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle. The auto-throttle functionality must be enabled on the throttle configuration page after having enabled the throttle module.
                          
+
                          It is important that update.php is run every time a module is updated to a newer version.
                          ', array('%permissions' => url('admin/access/permissions'), '%throttle' => url('admin/settings/throttle'), '%update-php' => $base_url .'/update.php'));
+  }
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function system_perm() {
+  return array('administer site configuration', 'access administration pages', 'select different theme');
+}
+
+/**
+ * Implementation of hook_elements().
+ */
+function system_elements() {
+  // Top level form
+  $type['form'] = array('#method' => 'post', '#action' => request_uri());
+
+  // Inputs
+  $type['checkbox'] = array('#input' => TRUE, '#return_value' => 1);
+  $type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => TRUE);
+  $type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => FALSE);
+  $type['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE);
+  $type['password'] = array('#input' => TRUE, '#size' => 30);
+  $type['password_confirm'] = array('#input' => TRUE, '#process' => array('expand_password_confirm' => array()));
+  $type['textarea'] = array('#input' => TRUE, '#cols' => 60, '#rows' => 5);
+  $type['radios'] = array('#input' => TRUE, '#process' => array('expand_radios' => array()));
+  $type['radio'] = array('#input' => TRUE);
+  $type['checkboxes'] = array('#input' => TRUE, '#process' => array('expand_checkboxes' => array()), '#tree' => TRUE);
+  $type['select'] = array('#input' => TRUE);
+  $type['weight'] = array('#input' => TRUE, '#delta' => 10, '#default_value' => 0);
+  $type['date'] = array('#input' => TRUE, '#process' => array('expand_date' => array()), '#validate' => array('date_validate' => array()));
+  $type['file'] = array('#input' => TRUE, '#size' => 60);
+
+  // Form structure
+  $type['item'] = array();
+  $type['hidden'] = array('#input' => TRUE);
+  $type['value'] = array('#input' => TRUE);
+  $type['markup'] = array('#prefix' => '', '#suffix' => '');
+  $type['fieldset'] = array('#collapsible' => FALSE, '#collapsed' => FALSE);
+  return $type;
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function system_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'system/files', 'title' => t('file download'),
+      'callback' => 'file_download',
+      'access' => TRUE,
+      'type' => MENU_CALLBACK);
+
+    $access = user_access('administer site configuration');
+
+    $items[] = array('path' => 'admin', 'title' => t('administer'),
+      'access' => user_access('access administration pages'),
+      'callback' => 'watchdog_overview',
+      'weight' => 9);
+
+    // Themes:
+    $items[] = array('path' => 'admin/themes', 'title' => t('themes'),
+      'callback' => 'system_themes', 'access' => $access);
+
+    $items[] = array('path' => 'admin/themes/select', 'title' => t('list'),
+      'callback' => 'system_themes', 'access' => $access,
+      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1);
+
+    $items[] = array('path' => 'admin/themes/settings', 'title' => t('configure'),
+      'callback' => 'system_theme_settings', 'access' => $access,
+      'type' => MENU_LOCAL_TASK);
+
+    // Theme configuration subtabs
+    $items[] = array('path' => 'admin/themes/settings/global', 'title' => t('global settings'),
+      'callback' => 'system_theme_settings', 'access' => $access,
+      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1);
+
+    foreach (list_themes() as $theme) {
+      if ($theme->status) {
+        $items[] = array('path' => 'admin/themes/settings/'. $theme->name, 'title' => $theme->name,
+        'callback' => 'system_theme_settings', 'callback arguments' => array($theme->name), 'access' => $access,
+        'type' => MENU_LOCAL_TASK);
+      }
+    }
+
+    // Modules:
+    $items[] = array('path' => 'admin/settings', 'title' => t('settings'),
+      'callback' => 'system_site_settings', 'access' => $access);
+    foreach (module_list() as $name) {
+      if (module_hook($name, 'settings')) {
+        $items[] = array('path' => 'admin/settings/'. $name, 'title' => t($name));
+      }
+    }
+    $items[] = array('path' => 'admin/modules', 'title' => t('modules'),
+      'callback' => 'system_modules', 'access' => $access);
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_user().
+ *
+ * Allows users to individually set their theme and time zone.
+ */
+function system_user($type, $edit, &$user, $category = NULL) {
+  if ($type == 'form' && $category == 'account') {
+    $form['theme_select'] = system_theme_select_form(t('Selecting a different theme will change the look and feel of the site.'), $edit['theme'], 2);
+
+    if (variable_get('configurable_timezones', 1)) {
+      $zones = _system_zonelist();
+      $form['timezone'] = array('#type'=>'fieldset', '#title' => t('Locale settings'), '#weight' => 6);
+      $form['timezone']['timezone'] = array(
+        '#type' => 'select', '#title' => t('Time zone'), '#default_value' => strlen($edit['timezone']) ? $edit['timezone'] : variable_get('date_default_timezone', 0),
+        '#options' => $zones, '#description' => t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')
+      );
+    }
+
+    return $form;
+  }
+}
+
+/*
+ * Returns a fieldset containing the theme select form.
+ *
+ * @param $description
+ *    description of the fieldset
+ * @param $default_value
+ *    default value of theme radios
+ * @param $weight
+ *    weight of the fieldset
+ * @return
+ *    a form array
+ */
+function system_theme_select_form($description = '', $default_value = '', $weight = 0) {
+  if (user_access('select different theme')) {
+    foreach (list_themes() as $theme) {
+      if ($theme->status) {
+        $enabled[] = $theme;
+      }
+    }
+
+    if (count($enabled) > 1) {
+      ksort($enabled);
+
+      $form['themes'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Theme configuration'),
+        '#description' => $description,
+        '#collapsible' => TRUE,
+        '#theme' => 'system_theme_select_form'
+      );
+
+      foreach ($enabled as $info) {
+        // For the default theme, revert to an empty string so the user's theme updates when the site theme is changed.
+        $info->key = $info->name == variable_get('theme_default', 'bluemarine') ? '' : $info->name;
+
+        $info->screenshot = dirname($info->filename) . '/screenshot.png';
+        $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), false) : t('no screenshot');
+
+        $form['themes'][$info->key]['screenshot'] = array('#type' => 'markup', '#value' => $screenshot);
+        $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name,  '#value' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'bluemarine') ? t('
                           (site default theme)') : ''));
+        $options[$info->key] = '';
+      }
+
+      $form['themes']['theme'] = array('#type' => 'radios', '#options' => $options, '#default_value' => $default_value ? $default_value : '');
+      $form['#weight'] = $weight;
+      return $form;
+    }
+  }
+}
+
+function theme_system_theme_select_form($form) {
+  foreach (element_children($form) as $key) {
+    $row = array();
+    if (is_array($form[$key]['description'])) {
+      $row[] = form_render($form[$key]['screenshot']);
+      $row[] = form_render($form[$key]['description']);
+      $row[] = form_render($form['theme'][$key]);
+    }
+    $rows[] = $row;
+  }
+
+  $header = array(t('Screenshot'), t('Name'), t('Selected'));
+  $output = theme('table', $header, $rows);
+  return $output;
+}
+
+function _system_zonelist() {
+  $timestamp = time();
+  $zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14);
+  $zones = array();
+  foreach ($zonelist as $offset) {
+    $zone = $offset * 3600;
+    $zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', 'l, F j, Y - H:i') . ' O', $zone);
+  }
+  return $zones;
+}
+
+function system_view_general() {
+  // General settings:
+  $form['general'] = array(
+    '#type' => 'fieldset', '#title' => t('General settings'),
+    '#collapsible' => TRUE, '#collapsed' => TRUE
+  );
+  $form['general']['site_name'] = array(
+    '#type' => 'textfield', '#title' => t('Name'), '#default_value' => variable_get('site_name', 'drupal'),
+    '#description' => t('The name of this web site.'), '#required' => TRUE
+  );
+  $form['general']['site_mail'] = array(
+    '#type' => 'textfield', '#title' => t('E-mail address'), '#default_value' => variable_get('site_mail', ini_get('sendmail_from')),
+    '#description' => t('A valid e-mail address for this website, used by the auto-mailer during registration, new password requests, notifications, etc.')
+  );
+  $form['general']['site_slogan'] = array(
+    '#type' => 'textfield', '#title' => t('Slogan'), '#default_value' => variable_get('site_slogan', ''),
+    '#description' => t('The slogan of this website. Some themes display a slogan when available.')
+  );
+
+  $form['general']['site_mission'] = array(
+    '#type' => 'textarea', '#title' => t('Mission'), '#default_value' => variable_get('site_mission', ''),
+    '#description' => t('Your site\'s mission statement or focus.')
+  );
+  $form['general']['site_footer'] = array(
+    '#type' => 'textarea', '#title' => t('Footer message'), '#default_value' => variable_get('site_footer', ''),
+    '#description' => t('This text will be displayed at the bottom of each page.  Useful for adding a copyright notice to your pages.')
+  );
+  $form['general']['anonymous'] = array(
+    '#type' => 'textfield', '#title' => t('Anonymous user'), '#default_value' => variable_get('anonymous', 'Anonymous'),
+    '#description' => t('The name used to indicate anonymous users.')
+  );
+  $form['general']['site_frontpage'] = array(
+    '#type' => 'textfield', '#title' => t('Default front page'), '#default_value' => variable_get('site_frontpage', 'node'),
+    '#description' => t('The home page displays content from this relative URL.  If you are not using clean URLs, specify the part after "?q=".  If unsure, specify "node".')
+  );
+
+  // We check for clean URL support using an image on the client side.
+  $form['general']['clean_url'] = array(
+    '#type' => 'radios',
+    '#title' => t('Clean URLs'),
+    '#default_value' => variable_get('clean_url', 0),
+    '#options' => array(t('Disabled'), t('Enabled')),
+    '#description' => t('This option makes Drupal emit "clean" URLs (i.e. without ?q= in the URL.)'),
+  );
+
+  if (!variable_get('clean_url', 0)) {
+    if (strpos(request_uri(), '?q=') !== FALSE) {
+      $form['general']['clean_url']['#description'] .= t(' Before enabling clean URLs, you must perform a test to determine if your server is properly configured. If you are able to see this page again after clicking the "Run the clean URL test" link, the test has succeeded and the radio buttons above will be available. If instead you are directed to a "Page not found" error, you will need to change the configuration of your server. The handbook page on Clean URLs has additional troubleshooting information. %run-test', array('%handbook' => 'http://drupal.org/node/15365', '%run-test' => ''. t('Run the clean URL test') .''));
+      $form['general']['clean_url']['#attributes'] = array('disabled' => 'disabled');
+    }
+    else {
+      $form['general']['clean_url']['#description'] .= t(' You have successfully demonstrated that clean URLs work on your server. You are welcome to enable/disable them as you wish.');
+      $form['general']['#collapsed'] = FALSE;
+    }
+  }
+
+  // Error handling:
+
+  $form['errors'] = array( '#type' => 'fieldset', '#title' =>t('Error handling'), '#collapsible' => TRUE, '#collapsed' => TRUE );
+  $form['errors']['site_403'] = array(
+    '#type' => 'textfield', '#title' => t('Default 403 (access denied) page'), '#default_value' => variable_get('site_403', ''),
+    '#description' => t('This page is displayed when the requested document is denied to the current user.  If you are not using clean URLs, specify the part after "?q=". If unsure, specify nothing.')
+  );
+
+  $form['errors']['site_404'] = array(
+    '#type' => 'textfield', '#title' => t('Default 404 (not found) page'), '#default_value' =>  variable_get('site_404', ''),
+    '#description' => t('This page is displayed when no other content matches the requested document.  If you are not using clean URLs, specify the part after "?q=". If unsure, specify nothing.')
+  );
+
+  $form['errors']['error_level'] = array(
+    '#type' => 'select', '#title' => t('Error reporting'), '#default_value' => variable_get('error_level', 1),
+    '#options' => array(t('Write errors to the log'), t('Write errors to the log and to the screen')),
+    '#description' =>  t('Where Drupal, PHP and SQL errors are logged. On a production server it is recommended that errors are only written to the error log. On a test server it can be helpful to write logs to the screen.')
+  );
+
+  $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval');
+  $period['1000000000'] = t('Never');
+  $form['errors']['watchdog_clear'] = array(
+    '#type' => 'select', '#title' => t('Discard log entries older than'), '#default_value' => variable_get('watchdog_clear', 604800), '#options' => $period,
+    '#description' => t('The time log entries should be kept.  Older entries will be automatically discarded.  Requires crontab.')
+  );
+
+
+  // Caching:
+  $form['cache'] = array('#type' => 'fieldset', '#title' => t('Cache settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);
+
+  $form['cache']['cache']  = array(
+    '#type' => 'radios',  '#title' => t('Page cache'), '#default_value' => variable_get('cache', CACHE_DISABLED),
+    '#options' => array(CACHE_DISABLED => t('Disabled'), CACHE_ENABLED => t('Enabled')),
+    '#description' => t("Drupal has a caching mechanism which stores dynamically generated web pages in a database.  By caching a web page, Drupal does not have to create the page each time someone wants to view it, instead it takes only one SQL query to display it, reducing response time and the server's load.  Only pages requested by \"anonymous\" users are cached.  In order to reduce server load and save bandwidth, Drupal stores and sends compressed cached pages.")
+  );
+
+  $period = drupal_map_assoc(array(0, 60, 180, 300, 600, 900, 1800, 2700, 3600, 10800, 21600, 32400, 43200, 86400), 'format_interval');
+  $period[0] = t('none');
+  $form['cache']['cache_lifetime'] = array(
+    '#type' => 'select', '#title' => t('Minimum cache lifetime'), '#default_value' => variable_get('cache_lifetime', 0), '#options' => $period,
+    '#description' => t('Enabling the cache will offer a sufficient performance boost for most low-traffic and medium-traffic sites.  On high-traffic sites it can become necessary to enforce a minimum cache lifetime.  The minimum cache lifetime is the minimum amount of time that will go by before the cache is emptied and recreated.  A larger minimum cache lifetime offers better performance, but users will not see new content for a longer period of time.')
+  );
+
+
+  // File system:
+  $form['files'] = array('#type' => 'fieldset', '#title' => t('File system settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);
+
+  $form['files']['file_directory_path'] = array(
+    '#type' => 'textfield',
+    '#title' => t('File system path'),
+    '#default_value' => file_directory_path(),
+    '#maxlength' => 255,
+    '#description' => t('A file system path where the files will be stored. This directory has to exist and be writable by Drupal. If the download method is set to public this directory has to be relative to Drupal installation directory, and be accessible over the web. When download method is set to private this directory should not be accessible over the web. Changing this location after the site has been in use will cause problems so only change this setting on an existing site if you know what you are doing.'),
+    '#after_build' => array('system_check_directory'),
+  );
+
+  $form['files']['file_directory_temp'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Temporary directory'),
+    '#default_value' => file_directory_temp(),
+    '#maxlength' => 255,
+    '#description' => t('Location where uploaded files will be kept during previews. Relative paths will be resolved relative to the Drupal installation directory.'),
+    '#after_build' => array('system_check_directory'),
+  );
+
+  $form['files']['file_downloads'] = array(
+    '#type' => 'radios', '#title' => t('Download method'), '#default_value' => variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC),
+    '#options' => array(FILE_DOWNLOADS_PUBLIC => t('Public - files are available using http directly.'), FILE_DOWNLOADS_PRIVATE => t('Private - files are transferred by Drupal.')),
+    '#description' => t('If you want any sort of access control on the downloading of files, this needs to be set to private. You can change this at any time, however all download URLs will change and there may be unexpected problems so it is not recommended.')
+  );
+
+  // Image handling:
+  $toolkits_available = image_get_available_toolkits();
+  if (count($toolkits_available) > 1) {
+    $form['image'] = array('#type' => 'fieldset', '#title' => t('Image handling'), '#collapsible' => TRUE, '#collapsed' => true);
+    $form['image']['image_toolkit'] = array(
+      '#type' => 'radios', '#title' => t('Select an image processing toolkit'),
+      '#default_value' => variable_get('image_toolkit', image_get_toolkit()), '#options' => $toolkits_available
+    );
+  }
+
+  // Feed settings
+  $form['feed'] = array('#type' => 'fieldset', '#title' => t('RSS feed settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);
+  $form['feed']['feed_default_items'] = array(
+    '#type' => 'select', '#title' => t('Number of items per feed'), '#default_value' => variable_get('feed_default_items', 10),
+    '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
+    '#description' => t('The default number of items to include in a feed.')
+  );
+  $form['feed']['feed_item_length'] = array(
+    '#type' => 'select', '#title' => t('Display of XML feed items'), '#default_value' => variable_get('feed_item_length','teaser'),
+    '#options' => array('title' => t('Titles only'), 'teaser' => t('Titles plus teaser'), 'fulltext' => t('Full text')),
+    '#description' => t('Global setting for the length of XML feed items that are output by default.')
+  );
+
+  // Date settings:
+  $zones = _system_zonelist();
+
+  // Date settings: possible date formats
+  $dateshort = array('Y-m-d H:i','m/d/Y - H:i', 'd/m/Y - H:i', 'Y/m/d - H:i',
+           'd.m.Y - H:i', 'm/d/Y - g:ia', 'd/m/Y - g:ia', 'Y/m/d - g:ia',
+           'M j Y - H:i', 'j M Y - H:i', 'Y M j - H:i',
+           'M j Y - g:ia', 'j M Y - g:ia', 'Y M j - g:ia');
+  $datemedium = array('D, Y-m-d H:i', 'D, m/d/Y - H:i', 'D, d/m/Y - H:i',
+          'D, Y/m/d - H:i', 'F j, Y - H:i', 'j F, Y - H:i', 'Y, F j - H:i',
+          'D, m/d/Y - g:ia', 'D, d/m/Y - g:ia', 'D, Y/m/d - g:ia',
+          'F j, Y - g:ia', 'j F Y - g:ia', 'Y, F j - g:ia', 'j. F Y - G:i');
+  $datelong = array('l, F j, Y - H:i', 'l, j F, Y - H:i', 'l, Y,  F j - H:i',
+        'l, F j, Y - g:ia', 'l, j F Y - g:ia', 'l, Y,  F j - g:ia', 'l, j. F Y - G:i');
+
+  // Date settings: construct choices for user
+  foreach ($dateshort as $f) {
+    $dateshortchoices[$f] = format_date(time(), 'custom', $f);
+  }
+  foreach ($datemedium as $f) {
+    $datemediumchoices[$f] = format_date(time(), 'custom', $f);
+  }
+  foreach ($datelong as $f) {
+    $datelongchoices[$f] = format_date(time(), 'custom', $f);
+  }
+
+  $form['dates'] = array('#type' => 'fieldset', '#title' => t('Date settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);
+  $form['dates']['date_default_timezone'] = array(
+    '#type' => 'select', '#title' => t('Default time zone'), '#default_value' => variable_get('date_default_timezone', 0),
+    '#options' => $zones, '#description' => t('Select the default site time zone.')
+  );
+
+  $form['dates']['configurable_timezones'] = array(
+    '#type' => 'radios', '#title' => t('Configurable time zones'), '#default_value' => variable_get('configurable_timezones', 1), '#options' => array(t('Disabled'), t('Enabled')),
+    '#description' => t('Enable or disable user-configurable time zones.  When enabled, users can set their own time zone and dates will be updated accordingly.')
+  );
+
+  $form['dates']['date_format_short'] = array(
+    '#type' => 'select', '#title' => t('Short date format'), '#default_value' => variable_get('date_format_short', $dateshort[0]),
+    '#options' => $dateshortchoices,  '#description' => t('The short format of date display.')
+  );
+
+  $form['dates']['date_format_medium'] = array(
+    '#type' => 'select', '#title' => t('Medium date format'), '#default_value' => variable_get('date_format_medium', $datemedium[0]),
+    '#options' => $datemediumchoices, '#description' => t('The medium sized date display.')
+  );
+
+  $form['dates']['date_format_long'] = array(
+    '#type' => 'select', '#title' => t('Long date format'), '#default_value' => variable_get('date_format_long', $datelong[0]),
+    '#options' => $datelongchoices, '#description' => t('Longer date format used for detailed display.')
+  );
+
+  $form['dates']['date_first_day'] = array(
+    '#type' => 'select', '#title' => t('First day of week'), '#default_value' => variable_get('date_first_day', 0),
+    '#options' => array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')),
+    '#description' => t('The first day of the week for calendar views.')
+  );
+
+
+  // Site off-line/maintenance settings
+  $form['site_status'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Site maintenance'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE);
+
+  $form['site_status']['site_offline'] = array(
+    '#type' => 'radios',
+    '#title' => t('Site status'),
+    '#default_value' => variable_get('site_offline', 0),
+    '#options' => array(t('Online'), t('Off-line')),
+    '#description' => t('When set to "Online", all visitors will be able to browse your site normally. When set to "Off-line", only users with the "administer site configuration" permission will be able to access your site to perform maintenance; all other visitors will see the site off-line message configured below. Authorized users can log in during "Off-line" mode directly via the user login page.', array('%user-login' => url('user'))),
+  );
+
+  $form['site_status']['site_offline_message'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Site off-line message'),
+    '#default_value' => variable_get('site_offline_message', t('%site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('%site' => variable_get('site_name', t('This Drupal site'))))),
+    '#description' => t('Message to show visitors when the site is in off-line mode.')
+  );
+
+  // String handling: report status and errors.
+  $form['strings'] = array('#type' => 'fieldset', '#title' => t('String handling'), '#collapsible' => TRUE, '#collapsed' => TRUE);
+  $form['strings'] = array_merge($form['strings'], unicode_settings());
+
+  // Cron: report status and errors.
+  $form['cron'] = array('#type' => 'fieldset', '#title' => t('Cron jobs'), '#collapsible' => TRUE, '#collapsed' => TRUE);
+  $form['cron'] = array_merge($form['cron'], system_cron_settings());
+
+  // Check database setup if necessary
+  if (function_exists('db_check_setup') && empty($_POST)) {
+    db_check_setup();
+  }
+  return $form;
+}
+
+/**
+ * Checks the existence of the directory specified in $form_element. This
+ * function is called from the system_view_general form to check both the
+ * file_directory_path and file_directory_temp directories. If validation
+ * fails, the form element is flagged with an error from within the
+ * file_check_directory function.
+ *
+ * @param $form_element
+ *   The form element containing the name of the directory to check.
+ */
+function system_check_directory($form_element) {
+  file_check_directory($form_element['#value'], FILE_CREATE_DIRECTORY, $form_element['#parents'][0]);
+  return $form_element;
+}
+
+/**
+ * Return the cron status and errors for admin/settings.
+ */
+function system_cron_settings() {
+  $cron_last = variable_get('cron_last', NULL);
+
+  if (is_numeric($cron_last)) {
+    $status = t('Cron is running. The last cron job ran %time ago.', array('%time' => format_interval(time() - $cron_last)));
+  }
+  else {
+    $status = t('Cron has not run. It appears cron jobs have not been setup on your system. Please check the help pages for configuring cron jobs.', array('%url' => 'http://drupal.org/cron'));
+  }
+
+  $form['settings'] = array('#type' => 'item', '#value' => $status);
+  return $form;
+}
+
+/**
+ * Retrieves the current status of an array of files in the system table.
+ */
+function system_get_files_database(&$files, $type) {
+  // Extract current files from database.
+  $result = db_query("SELECT filename, name, type, status, throttle, schema_version FROM {system} WHERE type = '%s'", $type);
+  while ($file = db_fetch_object($result)) {
+    if (isset($files[$file->name]) && is_object($files[$file->name])) {
+      $file->old_filename = $file->filename;
+      foreach ($file as $key => $value) {
+        if (!isset($files[$file->name]) || !isset($files[$file->name]->$key)) {
+          $files[$file->name]->$key = $value;
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Collect data about all currently available themes
+ */
+function system_theme_data() {
+  // Find themes
+  $themes = system_listing('\.theme$', 'themes');
+
+  // Find theme engines
+  $engines = system_listing('\.engine$', 'themes/engines');
+
+  // can't iterate over array itself as it uses a copy of the array items
+  foreach (array_keys($themes) as $key) {
+    drupal_get_filename('theme', $themes[$key]->name, $themes[$key]->filename);
+    drupal_load('theme', $themes[$key]->name);
+    $themes[$key]->owner = $themes[$key]->filename;
+    $themes[$key]->prefix = $key;
+  }
+
+  // Remove all theme engines from the system table
+  db_query("DELETE FROM {system} WHERE type = 'theme_engine'");
+
+  foreach ($engines as $engine) {
+    // Insert theme engine into system table
+    drupal_get_filename('theme_engine', $engine->name, $engine->filename);
+    drupal_load('theme_engine', $engine->name);
+    db_query("INSERT INTO {system} (name, type, filename, status, throttle, bootstrap) VALUES ('%s', '%s', '%s', %d, %d, %d)", $engine->name, 'theme_engine', $engine->filename, 1, 0, 0);
+
+    // Add templates to the site listing
+    foreach (call_user_func($engine->name . '_templates') as $template) {
+      // Do not double-insert templates with theme files in their directory,
+      // but do register their engine data.
+      if (array_key_exists($template->name, $themes)) {
+        $themes[$template->name]->template = TRUE;
+        $themes[$template->name]->owner = $engine->filename;
+        $themes[$template->name]->prefix = $engine->name;
+      }
+      else {
+        $template->template = TRUE;
+        $template->name = basename(dirname($template->filename));
+        $template->owner = $engine->filename;
+        $template->prefix = $engine->name;
+
+        $themes[$template->name] = $template;
+      }
+    }
+  }
+
+  // Find styles in each theme's directory.
+  foreach ($themes as $theme) {
+    foreach (file_scan_directory(dirname($theme->filename), 'style.css$') as $style) {
+      $style->style = TRUE;
+      $style->template = isset($theme->template) ? $theme->template : FALSE;
+      $style->name = basename(dirname($style->filename));
+      $style->owner = $theme->filename;
+      $style->prefix = $theme->template ? $theme->prefix : $theme->name;
+      // do not double-insert styles with theme files in their directory
+      if (array_key_exists($style->name, $themes)) {
+        continue;
+      }
+      $themes[$style->name] = $style;
+    }
+  }
+
+  // Extract current files from database.
+  system_get_files_database($themes, 'theme');
+
+  db_query("DELETE FROM {system} WHERE type = 'theme'");
+
+  foreach ($themes as $theme) {
+    db_query("INSERT INTO {system} (name, description, type, filename, status, throttle, bootstrap) VALUES ('%s', '%s', '%s', '%s', %d, %d, %d)", $theme->name, $theme->owner, 'theme', $theme->filename, $theme->status, 0, 0);
+  }
+
+  return $themes;
+}
+
+/**
+ * Get a list of available regions from a specified theme.
+ *
+ * @param $theme_key
+ *   The name of a theme.
+ * @return
+ *   An array of regions in the form $region['name'] = 'description'.
+ */
+function system_region_list($theme_key) {
+  static $list = array();
+
+  if (!array_key_exists($theme_key, $list)) {
+    $theme = db_fetch_object(db_query("SELECT * FROM {system} WHERE type = 'theme' AND name = '%s'", $theme_key));
+
+    // Stylesheets can't have regions; use its theme.
+    if (strpos($theme->filename, '.css')) {
+      return system_region_list(basename(dirname($theme->description)));
+    }
+
+    // If this is a custom theme, load it in before moving on.
+    if (file_exists($file = dirname($theme->filename) .'/' . $theme_key . '.theme')) {
+      include_once "./$file";
+    }
+
+    $regions = array();
+
+    // This theme has defined its own regions.
+    if (function_exists($theme_key . '_regions')) {
+      $regions = call_user_func($theme_key . '_regions');
+    }
+    // File is an engine; include its regions.
+    else if (strpos($theme->description, '.engine')) {
+      include_once './' . $theme->description;
+      $theme_engine = basename($theme->description, '.engine');
+      $regions = function_exists($theme_engine . '_regions') ? call_user_func($theme_engine . '_regions') : array();
+    }
+
+    $list[$theme_key] = $regions;
+  }
+
+  return $list[$theme_key];
+}
+
+/**
+ * Get the name of the default region for a given theme.
+ *
+ * @param $theme
+ *   The name of a theme.
+ * @return
+ *   A string that is the region name.
+ */
+function system_default_region($theme) {
+  $regions = array_keys(system_region_list($theme));
+  return $regions[0];
+}
+
+/**
+ * Returns an array of files objects of the given type from both the
+ * site-wide directory (i.e. modules/) and site-specific directory
+ * (i.e. sites/somesite/modules/).  The returned array will be keyed
+ * using the key specified (name, basename, filename).  Using name or
+ * basename will cause site-specific files to shadow files in the
+ * default directories.  That is, if a file with the same name appears
+ * in both location, only the site-specific version will be included.
+ *
+ * @param $mask
+ *   The regular expression of the files to find.
+ * @param $directory
+ *   The subdirectory name in which the files are found.  For example,
+ *   'modules' will search in both modules/ and
+ *   sites/somesite/modules/.
+ * @param $key
+ *   The key to be passed to file_scan_directory().
+ * @param $min_depth
+ *   Minimum depth of directories to return files from.
+ *
+ * @return
+ *   An array of file objects of the specified type.
+ */
+function system_listing($mask, $directory, $key = 'name', $min_depth = 1) {
+  $config = conf_path();
+  $searchdir = array($directory);
+  $files = array();
+
+  if (file_exists("$config/$directory")) {
+    $searchdir[] = "$config/$directory";
+  }
+
+  // Get current list of items
+  foreach ($searchdir as $dir) {
+    $files = array_merge($files, file_scan_directory($dir, $mask, array('.', '..', 'CVS'), 0, TRUE, $key, $min_depth));
+  }
+
+  return $files;
+}
+
+/**
+ * Assign an initial, default set of blocks for a theme.
+ *
+ * This function is called the first time a new theme is enabled.  The new theme
+ * gets a copy of the default theme's blocks, with the difference that if a
+ * particular region isn't available in the new theme, the block is assigned
+ * to the new theme's default region.
+ *
+ * @param $theme
+ *   The name of a theme.
+ */
+function system_initialize_theme_blocks($theme) {
+  // Initialize theme's blocks if none already registered.
+  if (!(db_num_rows(db_query("SELECT module FROM {blocks} WHERE theme = '%s'", $theme)))) {
+    $default_theme = variable_get('theme_default', 'bluemarine');
+    $regions = system_region_list($theme);
+    $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $default_theme);
+    while($block = db_fetch_array($result)) {
+      // If the region isn't supported by the theme, assign the block to the theme's default region.
+      if (!array_key_exists($block['region'], $regions)) {
+        $block['region'] = system_default_region($theme);
+      }
+      db_query("INSERT INTO {blocks} (module, delta, theme, status, weight, region, visibility, pages, custom, throttle) VALUES ('%s', '%s', '%s', %d, %d, '%s', %d, '%s', %d, %d)",
+          $block['module'], $block['delta'], $theme, $block['status'], $block['weight'], $block['region'], $block['visibility'], $block['pages'], $block['custom'], $block['throttle']);
+    }
+  }
+}
+
+// Add the submit / reset buttons and run drupal_get_form()
+function system_settings_form($form_id, $form) {
+  $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );
+  $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') );
+
+  if (!empty($_POST) && form_get_errors()) {
+    drupal_set_message(t('The settings have not been saved because of the errors.'), 'error');
+  }
+
+  return drupal_get_form($form_id, $form, 'system_settings_form');
+}
+
+function system_theme_settings_submit($form_id, $values) {
+  $op = isset($_POST['op']) ? $_POST['op'] : '';
+  $key = $values['var'];
+
+  // Exclude unnecessary elements.
+  unset($values['var'], $values['submit'], $values['reset'], $values['form_id']);
+
+  if ($op == t('Reset to defaults')) {
+    variable_del($key);
+    drupal_set_message(t('The configuration options have been reset to their default values.'));
+  }
+  else {
+    variable_set($key, $values);
+    drupal_set_message(t('The configuration options have been saved.'));
+  }
+}
+
+/**
+ * Execute the system_settings_form.
+ *
+ * If you want node type configure style handling of your checkboxes,
+ * add an array_filter value to your form.
+ *
+ */
+function system_settings_form_submit($form_id, $values) {
+  $op = isset($_POST['op']) ? $_POST['op'] : '';
+
+  // Exclude unnecessary elements.
+  unset($values['submit'], $values['reset'], $values['form_id']);
+
+  foreach ($values as $key => $value) {
+    if ($op == t('Reset to defaults')) {
+      variable_del($key);
+    }
+    else {
+      if (is_array($value) && isset($values['array_filter'])) {
+        $value = array_keys(array_filter($value));
+      }
+      variable_set($key, $value);
+    }
+  }
+  if ($op == t('Reset to defaults')) {
+    drupal_set_message(t('The configuration options have been reset to their default values.'));
+  }
+  else {
+    drupal_set_message(t('The configuration options have been saved.'));
+  }
+  menu_rebuild();
+}
+
+/**
+ * Menu callback; displays a listing of all themes.
+ */
+function system_themes() {
+  $themes = system_theme_data();
+  ksort($themes);
+
+  foreach ($themes as $info) {
+    $info->screenshot = dirname($info->filename) . '/screenshot.png';
+    $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), false) : t('no screenshot');
+
+    $form[$info->name]['screenshot'] = array('#type' => 'markup', '#value' => $screenshot);
+    $form[$info->name]['description'] = array('#type' => 'item', '#title' => $info->name,  '#value' => dirname($info->filename));
+    $options[$info->name] = '';
+    if ($info->status) {
+      $status[] = $info->name;
+    }
+    if ($info->status && (function_exists($info->prefix . '_settings') || function_exists($info->prefix . '_features'))) {
+      $form[$info->name]['operations'] = array('#type' => 'markup', '#value' => l(t('configure'), 'admin/themes/settings/' . $info->name) );
+    }
+    else {
+      // Dummy element for form_render. Cleaner than adding a check in the theme function.
+      $form[$info->name]['operations'] = array();
+    }
+  }
+
+  $form['status'] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => $status);
+  $form['theme_default'] = array('#type' => 'radios', '#options' => $options, '#default_value' => variable_get('theme_default', 'bluemarine'));
+  $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );
+  $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') );
+
+  return drupal_get_form('system_themes', $form);
+}
+
+function theme_system_themes($form) {
+  foreach (element_children($form) as $key) {
+    $row = array();
+    if (is_array($form[$key]['description'])) {
+      $row[] = form_render($form[$key]['screenshot']);
+      $row[] = form_render($form[$key]['description']);
+      $row[] = array('data' => form_render($form['status'][$key]), 'align' => 'center');
+      if ($form['theme_default']) {
+        $row[] = array('data' => form_render($form['theme_default'][$key]), 'align' => 'center');
+        $row[] = array('data' => form_render($form[$key]['operations']), 'align' => 'center');
+      }
+    }
+    $rows[] = $row;
+  }
+
+  $header = array(t('Screenshot'), t('Name'), t('Enabled'), t('Default'), t('Operations'));
+  $output = theme('table', $header, $rows);
+  $output .= form_render($form);
+  return $output;
+}
+
+
+function system_themes_submit($form_id, $values) {
+
+  db_query("UPDATE {system} SET status = 0 WHERE type = 'theme'");
+
+  if ($_POST['op'] == t('Save configuration')) {
+    if (is_array($values['status'])) {
+      foreach ($values['status'] as $key => $choice) {
+        // Always enable the default theme, despite its status checkbox being checked:
+        if ($choice || $values['theme_default'] == $key) {
+          // If theme status is being set to 1 from 0, initialize block data for this theme if necessary.
+          if (db_num_rows(db_query("SELECT status FROM {system} WHERE type = 'theme' AND name = '%s' AND status = 0", $key))) {
+            system_initialize_theme_blocks($key);
+          }
+          db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' and name = '%s'", $key);
+        }
+      }
+    }
+    variable_set('theme_default', $values['theme_default']);
+  }
+  else {
+    variable_del('theme_default');
+    db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name = 'bluemarine'");
+  }
+
+  menu_rebuild();
+  drupal_set_message(t('The configuration options have been saved.'));
+  return 'admin/themes';
+}
+
+/**
+ * Menu callback; displays a listing of all modules.
+ */
+function system_modules() {
+  // Get current list of modules
+  $files = system_listing('\.module$', 'modules', 'name', 0);
+
+  // Extract current files from database.
+  system_get_files_database($files, 'module');
+
+  ksort($files);
+
+  foreach ($files as $filename => $file) {
+    drupal_get_filename('module', $file->name, $file->filename);
+    drupal_load('module', $file->name);
+
+    $file->description = module_invoke($file->name, 'help', 'admin/modules#description');
+
+    $form['name'][$file->name] = array('#value' => $file->name);
+    $form['description'][$file->name] = array('#value' => $file->description);
+    $options[$file->name] = '';
+    if ($file->status) {
+      $status[] = $file->name;
+    }
+    if ($file->throttle) {
+      $throttle[] = $file->name;
+    }
+
+    // log the critical hooks implemented by this module
+    $bootstrap = 0;
+    foreach (bootstrap_hooks() as $hook) {
+      if (module_hook($file->name, $hook)) {
+        $bootstrap = 1;
+        break;
+      }
+    }
+
+    // Update the contents of the system table:
+    if (isset($file->status) || (isset($file->old_filename) && $file->old_filename != $file->filename)) {
+      db_query("UPDATE {system} SET description = '%s', name = '%s', bootstrap = %d, filename = '%s' WHERE filename = '%s'", $file->description, $file->name, $bootstrap, $file->filename, $file->old_filename);
+    }
+    else {
+      // This is a new module.
+      db_query("INSERT INTO {system} (name, description, type, filename, status, throttle, bootstrap) VALUES ('%s', '%s', '%s', '%s', %d, %d, %d)", $file->name, $file->description, 'module', $file->filename, $file->status, $file->throttle, $bootstrap);
+    }
+  }
+
+
+  // Handle status checkboxes, including overriding the generated
+  // checkboxes for required modules.
+  $form['status'] = array('#type' => 'checkboxes', '#default_value' => $status, '#options' => $options);
+  $required = array('block', 'filter', 'node', 'system', 'user', 'watchdog');
+  foreach ($required as $require) {
+    $form['status'][$require] = array('#type' => 'hidden', '#value' => 1, '#suffix' => t('required'));
+  }
+
+  /**
+   * Handle throttle checkboxes, including overriding the generated checkboxes for required modules.
+   */
+  if (module_exist('throttle')) {
+    $form['throttle'] = array('#type' => 'checkboxes', '#default_value' => $throttle, '#options' => $options);
+    $throttle_required = array_merge($required, array('throttle'));
+    foreach ($throttle_required as $require) {
+      $form['throttle'][$require] = array('#type' => 'hidden', '#value' => 0, '#suffix' => t('required'));
+    }
+  }
+
+  $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
+
+  return drupal_get_form('system_modules', $form);
+}
+
+function theme_system_modules($form) {
+  foreach (element_children($form['name']) as $key) {
+    $row = array();
+    $row[] = form_render($form['name'][$key]);
+    $row[] = form_render($form['description'][$key]);
+    $row[] = array('data' => form_render($form['status'][$key]), 'align' => 'center');
+
+    if (module_exist('throttle')) {
+      $row[] = array('data' => form_render($form['throttle'][$key]), 'align' => 'center');
+    }
+    $rows[] = $row;
+  }
+
+  $header = array(t('Name'), t('Description'), t('Enabled'));
+  if (module_exist('throttle')) {
+    $header[] = t('Throttle');
+  }
+
+  $output = theme('table', $header, $rows);
+  $output .= form_render($form);
+  return $output;
+}
+
+
+function system_modules_submit($form_id, $edit) {
+  db_query("UPDATE {system} SET status = 0, throttle = 0 WHERE type = 'module'");
+
+  $new_modules = array();
+  foreach ($edit['status'] as $key => $choice) {
+    if ($choice) {
+      db_query("UPDATE {system} SET status = 1 WHERE type = 'module' AND name = '%s'", $key);
+      if (!module_exist($key)) {
+        $new_modules[] = $key;
+      }
+    }
+  }
+
+  if (is_array($edit['throttle'])) {
+    foreach ($edit['throttle'] as $key => $choice) {
+      if ($choice) {
+        db_query("UPDATE {system} SET throttle = 1 WHERE type = 'module' and name = '%s'", $key);
+      }
+    }
+  }
+
+  module_list(TRUE, FALSE);
+
+  include './includes/install.inc';
+  foreach ($new_modules as $module) {
+    // Set the installed schema version for newly-enabled modules
+    $versions = drupal_get_schema_versions($module);
+    if (drupal_get_installed_schema_version($module) == SCHEMA_UNINSTALLED) {
+      drupal_set_installed_schema_version($module, $versions ? max($versions) : SCHEMA_INSTALLED);
+      module_invoke($module, 'install');
+    }
+  }
+
+  menu_rebuild();
+
+  drupal_set_message(t('The configuration options have been saved.'));
+  return 'admin/modules';
+}
+
+
+/**
+ * Menu callback; displays a module's settings page.
+ */
+function system_site_settings($module = NULL) {
+
+  if ($module) {
+    $form = module_invoke($module, 'settings');
+  }
+  else {
+    $form = system_view_general();
+    $module = 'system';
+  }
+
+  return system_settings_form($module . '_settings_form', $form);
+}
+
+/**
+ * Menu callback; display theme configuration for entire site and individual themes.
+ */
+function system_theme_settings($key = '') {
+  $directory_path = file_directory_path();
+  file_check_directory($directory_path, FILE_CREATE_DIRECTORY, 'file_directory_path');
+
+  // Default settings are defined in theme_get_settings() in includes/theme.inc
+  if ($key) {
+    $settings = theme_get_settings($key);
+    $var = str_replace('/', '_', 'theme_'. $key .'_settings');
+    $themes = system_theme_data();
+    $features = function_exists($themes[$key]->prefix . '_features') ? call_user_func($themes[$key]->prefix . '_features') : array();
+  }
+  else {
+    $settings = theme_get_settings('');
+    $var = 'theme_settings';
+  }
+
+  $form['var'] = array('#type' => 'hidden', '#value' => $var);
+
+  // Check for a new uploaded logo, and use that instead.
+  if ($file = file_check_upload('logo_upload')) {
+    if ($info = image_get_info($file->filepath)) {
+      $parts = pathinfo($file->filename);
+      $filename = ($key) ? str_replace('/', '_', $key) . '_logo.' . $parts['extension'] : 'logo.' . $parts['extension'];
+
+      if ($file = file_save_upload('logo_upload', $filename, 1)) {
+        $_POST['edit']['default_logo'] = 0;
+        $_POST['edit']['logo_path'] = $file->filepath;
+        $_POST['edit']['toggle_logo'] = 1;
+      }
+    }
+    else {
+      form_set_error('file_upload', t('Only JPEG, PNG and GIF images are allowed to be used as logos.'));
+    }
+  }
+
+  // Check for a new uploaded favicon, and use that instead.
+  if ($file = file_check_upload('favicon_upload')) {
+    $parts = pathinfo($file->filename);
+    $filename = ($key) ? str_replace('/', '_', $key) . '_favicon.' . $parts['extension'] : 'favicon.' . $parts['extension'];
+
+    if ($file = file_save_upload('favicon_upload', $filename, 1)) {
+      $_POST['edit']['default_favicon'] = 0;
+      $_POST['edit']['favicon_path'] = $file->filepath;
+      $_POST['edit']['toggle_favicon'] = 1;
+    }
+  }
+
+  // Toggle settings
+  $toggles = array(
+    'toggle_logo'                 => t('Logo'),
+    'toggle_name'                 => t('Site name'),
+    'toggle_slogan'               => t('Site slogan'),
+    'toggle_mission'              => t('Mission statement'),
+    'toggle_node_user_picture'    => t('User pictures in posts'),
+    'toggle_comment_user_picture' => t('User pictures in comments'),
+    'toggle_search'               => t('Search box'),
+    'toggle_favicon'              => t('Shortcut icon')
+  );
+
+  // Some features are not always available
+  $disabled = array();
+  if (!variable_get('user_pictures', 0)) {
+    $disabled['toggle_node_user_picture'] = true;
+    $disabled['toggle_comment_user_picture'] = true;
+  }
+  if (!module_exist('search')) {
+    $disabled['toggle_search'] = true;
+  }
+
+  $form['theme_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Toggle display'),
+    '#description' => t('Enable or disable the display of certain page elements.'),
+  );
+  foreach ($toggles as $name => $title) {
+    if ((!$key) || in_array($name, $features)) {
+      // disable search box if search.module is disabled
+      $form['theme_settings'][$name] = array('#type' => 'checkbox', '#title' => $title, '#default_value' => $settings[$name]);
+      if (isset($disabled[$name])) {
+        $form['theme_settings'][$name]['#attributes'] = array('disabled' => 'disabled');
+      }
+    }
+  }
+
+  // System wide only settings.
+  if (!$key) {
+    // Create neat 2-column layout for the toggles
+    $form['theme_settings'] += array(
+      '#prefix' => '
                          ',
+      '#suffix' => '
                          ',
+    );
+
+    // Toggle node display.
+    $node_types = module_invoke('node', 'get_types');
+    if ($node_types) {
+      $form['node_info'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Display post information on'),
+        '#description' =>  t('Enable or disable the submitted by Username on date text when displaying posts of the following type.'),
+        '#prefix' => '
                          ',
+        '#suffix' => '
                          ',
+      );
+      foreach ($node_types as $type => $name) {
+        $form['node_info']["toggle_node_info_$type"] = array('#type' => 'checkbox', '#title' => $name, '#default_value' => $settings["toggle_node_info_$type"]);
+      }
+    }
+  }
+
+  // Logo settings
+  if ((!$key) || in_array('toggle_logo', $features)) {
+    $form['logo'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Logo image settings'),
+      '#description' => t('If toggled on, the following logo will be displayed.'),
+      '#attributes' => array('class' => 'theme-settings-bottom'),
+    );
+    $form['logo']["default_logo"] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use the default logo'),
+      '#default_value' => $settings['default_logo'],
+      '#tree' => FALSE,
+      '#description' => t('Check here if you want the theme to use the logo supplied with it.')
+    );
+    $form['logo']['logo_path'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Path to custom logo'),
+      '#default_value' => $settings['logo_path'],
+      '#description' => t('The path to the file you would like to use as your logo file instead of the default logo.'));
+
+    $form['logo']['logo_upload'] = array(
+      '#type' => 'file',
+      '#title' => t('Upload logo image'),
+      '#maxlength' => 40,
+      '#description' => t("If you don't have direct file access to the server, use this field to upload your logo.")
+    );
+  }
+
+  // Icon settings
+  if ((!$key) || in_array('toggle_favicon', $features)) {
+    $form['favicon'] = array('#type' => 'fieldset', '#title' => t('Shortcut icon settings'));
+    $form['favicon']['text'] = array('#value' => t('Your shortcut icon or \'favicon\' is displayed in the address bar and bookmarks of most browsers.'));
+    $form['favicon']['default_favicon'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use the default shortcut icon.'),
+      '#default_value' => $settings['default_favicon'],
+      '#description' => t('Check here if you want the theme to use the default shortcut icon.')
+    );
+    $form['favicon']['favicon_path'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Path to custom icon'),
+      '#default_value' =>  $settings['favicon_path'],
+      '#description' => t('The path to the image file you would like to use as your custom shortcut icon.')
+    );
+
+    $form['favicon']['favicon_upload'] = array(
+      '#type' => 'file',
+      '#title' => t('Upload icon image'),
+      '#description' => t("If you don't have direct file access to the server, use this field to upload your shortcut icon.")
+    );
+  }
+
+  if ($key) {
+    // Template-specific settings
+    $function = $themes[$key]->prefix .'_settings';
+    if (function_exists($function)) {
+      if ($themes[$key]->template) {
+        // file is a template or a style of a template
+        $form['specific'] = array('#type' => 'fieldset', '#title' => t('Engine-specific settings'), '#description' => t('These settings only exist for all the templates and styles based on the %engine theme engine.', array('%engine' => $themes[$key]->prefix)));
+      }
+      else {
+        // file is a theme or a style of a theme
+        $form['specific'] = array('#type' => 'fieldset', '#title' => t('Theme-specific settings'), '#description' => t('These settings only exist for the %theme theme and all the styles based on it.', array('%theme' => $themes[$key]->prefix)));
+      }
+      $group = $function();
+      $form['specific'] = array_merge($form['specific'], (is_array($group) ? $group : array()));
+    }
+  }
+  $form['#attributes'] = array('enctype' => 'multipart/form-data');
+
+  return system_settings_form('system_theme_settings', $form);
+
+}
+
+/**
+ * Output a confirmation form
+ *
+ * This function outputs a complete form for confirming an action. A link is
+ * offered to go back to the item that is being changed in case the user changes
+ * his/her mind.
+ *
+ * You should use $GLOBALS['values']['edit'][$name] (where $name is usually 'confirm') to
+ * check if the confirmation was successful.
+ *
+ * @param $form_id
+ *   The unique form identifier. Used by the form API to construct the theme.
+ * @param $form
+ *   Additional elements to inject into the form, for example hidden elements.
+ * @param $question
+ *   The question to ask the user (e.g. "Are you sure you want to delete the
+ *   block foo?").
+ * @param $path
+ *   The page to go to if the user denies the action.
+ * @param $description
+ *   Additional text to display (defaults to "This action cannot be undone.").
+ * @param $yes
+ *   A caption for the button which confirms the action (e.g. "Delete",
+ *   "Replace", ...).
+ * @param $no
+ *   A caption for the link which denies the action (e.g. "Cancel").
+ * @param $name
+ *   The internal name used to refer to the confirmation item.
+ * @return
+ *   A themed HTML string representing the form.
+ */
+
+function confirm_form($form_id, $form, $question, $path, $description = NULL, $yes = NULL, $no = NULL, $name = 'confirm') {
+
+  $description = ($description) ? $description : t('This action cannot be undone.');
+  drupal_set_title($question);
+  $form['#attributes'] = array('class' => 'confirmation');
+  $form['description'] = array('#value' => $description);
+  $form[$name] = array('#type' => 'hidden', '#value' => 1);
+
+  $form['actions'] = array('#prefix' => '
                          ', '#suffix' => '
                          ');
+  $form['actions']['submit'] = array('#type' => 'submit', '#value' => $yes ? $yes : t('Confirm'));
+  $form['actions']['cancel'] = array('#value' => l($no ? $no : t('Cancel'), $path));
+  return drupal_get_form($form_id, $form, 'confirm_form');
+}
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
new file mode 100644
index 0000000..1bb18d5
--- /dev/null
+++ b/modules/taxonomy.module
@@ -0,0 +1,1365 @@
+links(taxonomy_link('taxonomy terms', $node));
+ * }
+ */
+function taxonomy_link($type, $node = NULL) {
+  if ($type == 'taxonomy terms' && $node != NULL) {
+    $links = array();
+    if (array_key_exists('taxonomy', $node)) {
+      foreach ($node->taxonomy as $term) {
+        $links[] = l($term->name, taxonomy_term_path($term), array('rel' => 'tag', 'title' => strip_tags($term->description)));
+      }
+    }
+    return $links;
+  }
+}
+
+function taxonomy_term_path($term) {
+  $vocabulary = taxonomy_get_vocabulary($term->vid);
+  if ($vocabulary->module != 'taxonomy' && $path = module_invoke($vocabulary->module, 'term_path', $term)) {
+    return $path;
+  }
+  return 'taxonomy/term/'. $term->tid;
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function taxonomy_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'admin/taxonomy',
+      'title' => t('categories'),
+      'callback' => 'taxonomy_overview_vocabularies',
+      'access' => user_access('administer taxonomy'));
+
+    $items[] = array('path' => 'admin/taxonomy/list',
+      'title' => t('list'),
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+      'weight' => -10);
+
+    $items[] = array('path' => 'admin/taxonomy/add/vocabulary',
+      'title' => t('add vocabulary'),
+      'callback' => 'taxonomy_admin_vocabulary_edit',
+      'access' => user_access('administer taxonomy'),
+      'type' => MENU_LOCAL_TASK);
+
+    $items[] = array('path' => 'admin/taxonomy/edit/vocabulary',
+      'title' => t('edit vocabulary'),
+      'callback' => 'taxonomy_admin_vocabulary_edit',
+      'access' => user_access('administer taxonomy'),
+      'type' => MENU_CALLBACK);
+
+    $items[] = array('path' => 'admin/taxonomy/edit/term',
+      'title' => t('edit term'),
+      'callback' => 'taxonomy_admin_term_edit',
+      'access' => user_access('administer taxonomy'),
+      'type' => MENU_CALLBACK);
+
+    $items[] = array('path' => 'taxonomy/term',
+      'title' => t('taxonomy term'),
+      'callback' => 'taxonomy_term_page',
+      'access' => user_access('access content'),
+      'type' => MENU_CALLBACK);
+
+    $items[] = array('path' => 'taxonomy/autocomplete',
+      'title' => t('autocomplete taxonomy'),
+      'callback' => 'taxonomy_autocomplete',
+      'access' => user_access('access content'),
+      'type' => MENU_CALLBACK);
+  }
+  else {
+    if (is_numeric(arg(2))) {
+      $items[] = array('path' => 'admin/taxonomy/' . arg(2),
+        'title' => t('list terms'),
+        'callback' => 'taxonomy_overview_terms',
+        'callback arguments' => array(arg(2)),
+        'access' => user_access('administer taxonomy'),
+        'type' => MENU_CALLBACK);
+
+      $items[] = array('path' => 'admin/taxonomy/' . arg(2) . '/list',
+        'title' => t('list'),
+        'type' => MENU_DEFAULT_LOCAL_TASK,
+        'weight' => -10);
+
+      $items[] = array('path' => 'admin/taxonomy/' . arg(2) . '/add/term',
+        'title' => t('add term'),
+        'callback' => 'taxonomy_form_term',
+        'callback arguments' => array(array('vid' => arg(2))),
+        'access' => user_access('administer taxonomy'),
+        'type' => MENU_LOCAL_TASK);
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * List and manage vocabularies.
+ */
+function taxonomy_overview_vocabularies() {
+  $vocabularies = taxonomy_get_vocabularies();
+  $rows = array();
+  foreach ($vocabularies as $vocabulary) {
+    $types = array();
+    foreach ($vocabulary->nodes as $type) {
+      $node_type = node_get_name($type);
+      $types[] = $node_type ? $node_type : $type;
+    }
+    $rows[] = array('name' => check_plain($vocabulary->name),
+      'type' => implode(', ', $types),
+      'edit' => l(t('edit vocabulary'), "admin/taxonomy/edit/vocabulary/$vocabulary->vid"),
+      'list' => l(t('list terms'), "admin/taxonomy/$vocabulary->vid"),
+      'add' => l(t('add terms'), "admin/taxonomy/$vocabulary->vid/add/term")
+    );
+  }
+  if (empty($rows)) {
+    $rows[] = array(array('data' => t('No categories available.'), 'colspan' => '5', 'class' => 'message'));
+  }
+  $header = array(t('Name'), t('Type'), array('data' => t('Operations'), 'colspan' => '3'));
+
+  return theme('table', $header, $rows, array('id' => 'taxonomy'));
+}
+
+/**
+ * Display a tree of all the terms in a vocabulary, with options to edit
+ * each one.
+ */
+function taxonomy_overview_terms($vid) {
+  $destination = drupal_get_destination();
+
+  $header = array(t('Name'), t('Operations'));
+  $vocabulary = taxonomy_get_vocabulary($vid);
+
+  drupal_set_title(check_plain($vocabulary->name));
+  $start_from      = $_GET['page'] ? $_GET['page'] : 0;
+  $total_entries   = 0;  // total count for pager
+  $page_increment  = 25; // number of tids per page
+  $displayed_count = 0;  // number of tids shown
+
+  $tree = taxonomy_get_tree($vocabulary->vid);
+  foreach ($tree as $term) {
+    $total_entries++; // we're counting all-totals, not displayed
+    if (($start_from && ($start_from * $page_increment) >= $total_entries) || ($displayed_count == $page_increment)) { continue; }
+    $rows[] = array(_taxonomy_depth($term->depth) . ' ' . l($term->name, "taxonomy/term/$term->tid"), l(t('edit'), "admin/taxonomy/edit/term/$term->tid", array(), $destination));
+    $displayed_count++; // we're counting tids displayed
+  }
+
+  if (!$rows) {
+    $rows[] = array(array('data' => t('No terms available.'), 'colspan' => '2'));
+  }
+
+  $GLOBALS['pager_page_array'][] = $start_from;  // FIXME
+  $GLOBALS['pager_total'][] = intval($total_entries / $page_increment) + 1; // FIXME
+
+  if ($total_entries >= $page_increment) {
+    $rows[] = array(array('data' => theme('pager', NULL, $page_increment), 'colspan' => '2'));
+  }
+
+  return theme('table', $header, $rows, array('id' => 'taxonomy'));
+}
+
+/**
+ * Display form for adding and editing vocabularies.
+ */
+function taxonomy_form_vocabulary($edit = array()) {
+  $form['name'] = array('#type' => 'textfield',
+    '#title' => t('Vocabulary name'),
+    '#default_value' => $edit['name'],
+    '#maxlength' => 64,
+    '#description' => t('The name for this vocabulary.  Example: "Topic".'),
+    '#required' => TRUE,
+  );
+  $form['description'] = array('#type' => 'textarea',
+    '#title' => t('Description'),
+    '#default_value' => $edit['description'],
+    '#description' => t('Description of the vocabulary; can be used by modules.'),
+  );
+  $form['help'] = array('#type' => 'textfield',
+    '#title' => t('Help text'),
+    '#default_value' => $edit['help'],
+    '#description' => t('Instructions to present to the user when choosing a term.'),
+  );
+  $form['nodes'] = array('#type' => 'checkboxes',
+    '#title' => t('Types'),
+    '#default_value' => $edit['nodes'],
+    '#options' => node_get_types(),
+    '#description' => t('A list of node types you want to associate with this vocabulary.'),
+    '#required' => TRUE,
+  );
+  $form['hierarchy'] = array('#type' => 'radios',
+    '#title' => t('Hierarchy'),
+    '#default_value' => $edit['hierarchy'],
+    '#options' => array(t('Disabled'), t('Single'), t('Multiple')),
+    '#description' => t('Allows a tree-like hierarchy between terms of this vocabulary.', array('%help-url' => url('admin/help/taxonomy', NULL, NULL, 'hierarchy'))),
+  );
+  $form['relations'] = array('#type' => 'checkbox',
+    '#title' => t('Related terms'),
+    '#default_value' => $edit['relations'],
+    '#description' => t('Allows related terms in this vocabulary.', array('%help-url' => url('admin/help/taxonomy', NULL, NULL, 'related-terms'))),
+  );
+  $form['tags'] = array('#type' => 'checkbox',
+    '#title' => t('Free tagging'),
+    '#default_value' => $edit['tags'],
+    '#description' => t('Content is categorized by typing terms instead of choosing from a list.'),
+  );
+  $form['multiple'] = array('#type' => 'checkbox',
+    '#title' => t('Multiple select'),
+    '#default_value' => $edit['multiple'],
+    '#description' => t('Allows nodes to have more than one term from this vocabulary (always true for free tagging).'),
+  );
+  $form['required'] = array('#type' => 'checkbox',
+    '#title' => t('Required'),
+    '#default_value' => $edit['required'],
+    '#description' => t('If enabled, every node must have at least one term in this vocabulary.'),
+  );
+  $form['weight'] = array('#type' => 'weight',
+    '#title' => t('Weight'),
+    '#default_value' => $edit['weight'],
+    '#description' => t('In listings, the heavier vocabularies will sink and the lighter vocabularies will be positioned nearer the top.'),
+  );
+
+  // Add extra vocabulary form elements.
+  $extra = module_invoke_all('taxonomy', 'form', 'vocabulary');
+  if (is_array($extra)) {
+    foreach ($extra as $key => $element) {
+      $extra[$key]['#weight'] = isset($extra[$key]['#weight']) ? $extra[$key]['#weight'] : -18;
+    }
+    $form = array_merge($form, $extra);
+  }
+
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
+  if ($edit['vid']) {
+    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
+    $form['vid'] = array('#type' => 'value', '#value' => $edit['vid']);
+    $form['module'] = array('#type' => 'value', '#value' => $edit['module']);
+  }
+  return drupal_get_form('taxonomy_form_vocabulary', $form);
+}
+
+/**
+ * Accept the form submission for a vocabulary and save the results.
+ */
+function taxonomy_form_vocabulary_submit($form_id, $form_values) {
+  // Fix up the nodes array to remove unchecked nodes.
+  $form_values['nodes'] = array_filter($form_values['nodes']);
+  switch (taxonomy_save_vocabulary($form_values)) {
+  case SAVED_NEW:
+    drupal_set_message(t('Created new vocabulary %name.', array('%name' => theme('placeholder', $form_values['name']))));
+    break;
+  case SAVED_UPDATED:
+    drupal_set_message(t('Updated vocabulary %name.', array('%name' => theme('placeholder', $form_values['name']))));
+    break;
+  }
+  return 'admin/taxonomy';
+}
+
+function taxonomy_save_vocabulary(&$edit) {
+  $edit['nodes'] = empty($edit['nodes']) ? array() : $edit['nodes'];
+
+  if ($edit['vid'] && $edit['name']) {
+    db_query("UPDATE {vocabulary} SET name = '%s', description = '%s', help = '%s', multiple = %d, required = %d, hierarchy = %d, relations = %d, tags = %d, weight = %d, module = '%s' WHERE vid = %d", $edit['name'], $edit['description'], $edit['help'], $edit['multiple'], $edit['required'], $edit['hierarchy'], $edit['relations'], $edit['tags'], $edit['weight'], isset($edit['module']) ? $edit['module'] : 'taxonomy', $edit['vid']);
+    db_query("DELETE FROM {vocabulary_node_types} WHERE vid = %d", $edit['vid']);
+    foreach ($edit['nodes'] as $type => $selected) {
+      db_query("INSERT INTO {vocabulary_node_types} (vid, type) VALUES (%d, '%s')", $edit['vid'], $type);
+    }
+    module_invoke_all('taxonomy', 'update', 'vocabulary', $edit);
+    $status = SAVED_UPDATED;
+  }
+  else if ($edit['vid']) {
+    $status = taxonomy_del_vocabulary($edit['vid']);
+  }
+  else {
+    $edit['vid'] = db_next_id('{vocabulary}_vid');
+    db_query("INSERT INTO {vocabulary} (vid, name, description, help, multiple, required, hierarchy, relations, tags, weight, module) VALUES (%d, '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, '%s')", $edit['vid'], $edit['name'], $edit['description'], $edit['help'], $edit['multiple'], $edit['required'], $edit['hierarchy'], $edit['relations'], $edit['tags'], $edit['weight'], isset($edit['module']) ? $edit['module'] : 'taxonomy');
+    foreach ($edit['nodes'] as $type => $selected) {
+      db_query("INSERT INTO {vocabulary_node_types} (vid, type) VALUES (%d, '%s')", $edit['vid'], $type);
+    }
+    module_invoke_all('taxonomy', 'insert', 'vocabulary', $edit);
+    $status = SAVED_NEW;
+  }
+
+  cache_clear_all();
+
+  return $status;
+}
+
+function taxonomy_del_vocabulary($vid) {
+  $vocabulary = (array) taxonomy_get_vocabulary($vid);
+
+  db_query('DELETE FROM {vocabulary} WHERE vid = %d', $vid);
+  db_query('DELETE FROM {vocabulary_node_types} WHERE vid = %d', $vid);
+  $result = db_query('SELECT tid FROM {term_data} WHERE vid = %d', $vid);
+  while ($term = db_fetch_object($result)) {
+    taxonomy_del_term($term->tid);
+  }
+
+  module_invoke_all('taxonomy', 'delete', 'vocabulary', $vocabulary);
+
+  cache_clear_all();
+
+  return SAVED_DELETED;
+}
+
+function _taxonomy_confirm_del_vocabulary($vid) {
+  $vocabulary = taxonomy_get_vocabulary($vid);
+
+  $form['type'] = array('#type' => 'value', '#value' => 'vocabulary');
+  $form['vid'] = array('#type' => 'value', '#value' => $vid);
+  $form['name'] = array('#type' => 'value', '#value' => $vocabulary->name);
+  return confirm_form('taxonomy_vocabulary_confirm_delete', $form,
+                  t('Are you sure you want to delete the vocabulary %title?',
+                  array('%title' => theme('placeholder', $vocabulary->name))),
+                  'admin/taxonomy', t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'),
+                  t('Delete'),
+                  t('Cancel'));
+}
+
+function taxonomy_vocabulary_confirm_delete_submit($form_id, $form_values) {
+  $status = taxonomy_del_vocabulary($form_values['vid']);
+  drupal_set_message(t('Deleted vocabulary %name.', array('%name' => theme('placeholder', $form_values['name']))));
+  return 'admin/taxonomy';
+}
+
+function taxonomy_form_term($edit = array()) {
+  $vocabulary_id = isset($edit['vid']) ? $edit['vid'] : arg(4);
+  $vocabulary = taxonomy_get_vocabulary($vocabulary_id);
+
+  $form['name'] = array('#type' => 'textfield', '#title' => t('Term name'), '#default_value' => $edit['name'], '#maxlength' => 64, '#description' => t('The name for this term.  Example: "Linux".'), '#required' => TRUE);
+
+  $form['description'] = array('#type' => 'textarea', '#title' => t('Description'), '#default_value' => $edit['description'], '#description' => t('A description of the term.'));
+
+  if ($vocabulary->hierarchy) {
+    $parent = array_keys(taxonomy_get_parents($edit['tid']));
+    $children = taxonomy_get_tree($vocabulary_id, $edit['tid']);
+
+    // A term can't be the child of itself, nor of its children.
+    foreach ($children as $child) {
+      $exclude[] = $child->tid;
+    }
+    $exclude[] = $edit['tid'];
+
+    if ($vocabulary->hierarchy == 1) {
+      $form['parent'] = _taxonomy_term_select(t('Parent'), 'parent', $parent, $vocabulary_id, l(t('Parent term'), 'admin/help/taxonomy', NULL, NULL, 'parent') .'.', 0, '<'. t('root') .'>', $exclude);
+    }
+    elseif ($vocabulary->hierarchy == 2) {
+      $form['parent'] = _taxonomy_term_select(t('Parents'), 'parent', $parent, $vocabulary_id, l(t('Parent terms'), 'admin/help/taxonomy', NULL, NULL, 'parent') .'.', 1, '<'. t('root') .'>', $exclude);
+    }
+  }
+
+  if ($vocabulary->relations) {
+    $form['relations'] = _taxonomy_term_select(t('Related terms'), 'relations', array_keys(taxonomy_get_related($edit['tid'])), $vocabulary_id, NULL, 1, '<'. t('none') .'>', array($edit['tid']));
+  }
+
+  $form['synonyms'] = array('#type' => 'textarea', '#title' => t('Synonyms'), '#default_value' => implode("\n", taxonomy_get_synonyms($edit['tid'])), '#description' => t('Synonyms of this term, one synonym per line.', array('%help-url' => url('admin/help/taxonomy', NULL, NULL, 'synonyms'))));
+  $form['weight'] = array('#type' => 'weight', '#title' => t('Weight'), '#default_value' => $edit['weight'], '#description' => t('In listings, the heavier terms will sink and the lighter terms will be positioned nearer the top.'));
+
+  // Add extra term form elements.
+  $extra = module_invoke_all('taxonomy', 'form', 'term');
+  if (is_array($extra)) {
+    foreach ($extra as $key => $element) {
+      $extra[$key]['#weight'] = isset($extra[$key]['#weight']) ? $extra[$key]['#weight'] : -18;
+    }
+    $form = array_merge($form, $extra);
+  }
+
+
+  $form['vid'] = array('#type' => 'value', '#value' => $vocabulary->vid);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
+
+  if ($edit['tid']) {
+    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
+    $form['tid'] = array('#type' => 'value', '#value' => $edit['tid']);
+  }
+  else {
+    $form['destination'] = array('#type' => 'hidden', '#value' => $_GET['q']);
+  }
+
+  return drupal_get_form('taxonomy_form_term', $form);
+}
+
+/**
+ * Accept the form submission for a taxonomy term and save the result.
+ */
+function taxonomy_form_term_submit($form_id, $form_values) {
+  switch (taxonomy_save_term($form_values)) {
+    case SAVED_NEW:
+      drupal_set_message(t('Created new term %term.', array('%term' => theme('placeholder', $form_values['name']))));
+      break;
+    case SAVED_UPDATED:
+      drupal_set_message(t('The term %term has been updated.', array('%term' => theme('placeholder', $form_values['name']))));
+      break;
+  }
+  return 'admin/taxonomy';
+}
+
+function taxonomy_save_term(&$edit) {
+  if ($edit['tid'] && $edit['name']) {
+    db_query("UPDATE {term_data} SET name = '%s', description = '%s', weight = %d WHERE tid = %d", $edit['name'], $edit['description'], $edit['weight'], $edit['tid']);
+    module_invoke_all('taxonomy', 'update', 'term', $edit);
+    $status = SAVED_UPDATED;
+  }
+  else if ($edit['tid']) {
+    return taxonomy_del_term($edit['tid']);
+  }
+  else {
+    $edit['tid'] = db_next_id('{term_data}_tid');
+    db_query("INSERT INTO {term_data} (tid, name, description, vid, weight) VALUES (%d, '%s', '%s', %d, %d)", $edit['tid'], $edit['name'], $edit['description'], $edit['vid'], $edit['weight']);
+    module_invoke_all('taxonomy', 'insert', 'term', $edit);
+    $status = SAVED_NEW;
+  }
+
+  db_query('DELETE FROM {term_relation} WHERE tid1 = %d OR tid2 = %d', $edit['tid'], $edit['tid']);
+  if ($edit['relations']) {
+    foreach ($edit['relations'] as $related_id) {
+      if ($related_id != 0) {
+        db_query('INSERT INTO {term_relation} (tid1, tid2) VALUES (%d, %d)', $edit['tid'], $related_id);
+      }
+    }
+  }
+
+  db_query('DELETE FROM {term_hierarchy} WHERE tid = %d', $edit['tid']);
+  if (!isset($edit['parent']) || empty($edit['parent'])) {
+    $edit['parent'] = array(0);
+  }
+  if (is_array($edit['parent'])) {
+    foreach ($edit['parent'] as $parent) {
+      if (is_array($parent)) {
+        foreach ($parent as $tid) {
+          db_query('INSERT INTO {term_hierarchy} (tid, parent) VALUES (%d, %d)', $edit['tid'], $tid);
+        }
+      }
+      else {
+        db_query('INSERT INTO {term_hierarchy} (tid, parent) VALUES (%d, %d)', $edit['tid'], $parent);
+      }
+    }
+  }
+  else {
+    db_query('INSERT INTO {term_hierarchy} (tid, parent) VALUES (%d, %d)', $edit['tid'], $edit['parent']);
+  }
+
+  db_query('DELETE FROM {term_synonym} WHERE tid = %d', $edit['tid']);
+  if ($edit['synonyms']) {
+    foreach (explode ("\n", str_replace("\r", '', $edit['synonyms'])) as $synonym) {
+      if ($synonym) {
+        db_query("INSERT INTO {term_synonym} (tid, name) VALUES (%d, '%s')", $edit['tid'], chop($synonym));
+      }
+    }
+  }
+
+  cache_clear_all();
+
+  return $status;
+}
+
+function taxonomy_del_term($tid) {
+  $tids = array($tid);
+  while ($tids) {
+    $children_tids = $orphans = array();
+    foreach ($tids as $tid) {
+      // See if any of the term's children are about to be become orphans:
+      if ($children = taxonomy_get_children($tid)) {
+        foreach ($children as $child) {
+          // If the term has multiple parents, we don't delete it.
+          $parents = taxonomy_get_parents($child->tid);
+          if (count($parents) == 1) {
+            $orphans[] = $child->tid;
+          }
+        }
+      }
+
+      $term = (array) taxonomy_get_term($tid);
+
+      db_query('DELETE FROM {term_data} WHERE tid = %d', $tid);
+      db_query('DELETE FROM {term_hierarchy} WHERE tid = %d', $tid);
+      db_query('DELETE FROM {term_relation} WHERE tid1 = %d OR tid2 = %d', $tid, $tid);
+      db_query('DELETE FROM {term_synonym} WHERE tid = %d', $tid);
+      db_query('DELETE FROM {term_node} WHERE tid = %d', $tid);
+
+      module_invoke_all('taxonomy', 'delete', 'term', $term);
+    }
+
+    $tids = $orphans;
+  }
+
+  cache_clear_all();
+
+  return SAVED_DELETED;
+}
+
+function _taxonomy_confirm_del_term($tid) {
+  $term = taxonomy_get_term($tid);
+
+  $form['type'] = array('#type' => 'value', '#value' => 'term');
+  $form['name'] = array('#type' => 'value', '#value' => $term->name);
+  $form['tid'] = array('#type' => 'value', '#value' => $tid);
+  return confirm_form('taxonomy_term_confirm_delete', $form,
+                  t('Are you sure you want to delete the term %title?',
+                  array('%title' => theme('placeholder', $term->name))),
+                  'admin/taxonomy',
+                  t('Deleting a term will delete all its children if there are any. This action cannot be undone.'),
+                  t('Delete'),
+                  t('Cancel'));
+}
+
+function taxonomy_term_confirm_delete_submit($form_id, $form_values) {
+  taxonomy_del_term($form_values['tid']);
+  drupal_set_message(t('Deleted term %name.', array('%name' => theme('placeholder', $form_values['name']))));
+  return 'admin/taxonomy';
+}
+
+/**
+ * Generate a form element for selecting terms from a vocabulary.
+ */
+function taxonomy_form($vid, $value = 0, $help = NULL, $name = 'taxonomy') {
+  $vocabulary = taxonomy_get_vocabulary($vid);
+  $help = ($help) ? $help : $vocabulary->help;
+  if ($vocabulary->required) {
+    $blank = 0;
+  }
+  else {
+    $blank = '<'. t('none') .'>';
+  }
+
+  return _taxonomy_term_select(check_plain($vocabulary->name), $name, $value, $vid, $help, intval($vocabulary->multiple), $blank);
+}
+
+/**
+ * Generate a set of options for selecting a term from all vocabularies. Can be
+ * passed to form_select.
+ */
+function taxonomy_form_all($free_tags = 0) {
+  $vocabularies = taxonomy_get_vocabularies();
+  $options = array();
+  foreach ($vocabularies as $vid => $vocabulary) {
+    if ($vocabulary->tags && !$free_tags) { continue; }
+    $tree = taxonomy_get_tree($vid);
+    $options[$vocabulary->name] = array();
+    if ($tree) {
+      foreach ($tree as $term) {
+        $options[$vocabulary->name][$term->tid] = _taxonomy_depth($term->depth, '-') . $term->name;
+      }
+    }
+  }
+  return $options;
+}
+
+/**
+ * Return an array of all vocabulary objects.
+ *
+ * @param $type
+ *   If set, return only those vocabularies associated with this node type.
+ */
+function taxonomy_get_vocabularies($type = NULL) {
+  if ($type) {
+    $result = db_query(db_rewrite_sql("SELECT v.vid, v.*, n.type FROM {vocabulary} v LEFT JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE n.type = '%s' ORDER BY v.weight, v.name", 'v', 'vid'), $type);
+  }
+  else {
+    $result = db_query(db_rewrite_sql('SELECT v.*, n.type FROM {vocabulary} v LEFT JOIN {vocabulary_node_types} n ON v.vid = n.vid ORDER BY v.weight, v.name', 'v', 'vid'));
+  }
+
+  $vocabularies = array();
+  $node_types = array();
+  while ($voc = db_fetch_object($result)) {
+    $node_types[$voc->vid][] = $voc->type;
+    unset($voc->type);
+    $voc->nodes = $node_types[$voc->vid];
+    $vocabularies[$voc->vid] = $voc;
+  }
+
+  return $vocabularies;
+}
+
+/**
+ * Generate a form for selecting terms to associate with a node.
+ */
+function taxonomy_form_alter($form_id, &$form) {
+  if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    $node = $form['#node'];
+
+    if (!isset($node->taxonomy)) {
+      if ($node->nid) {
+        $terms = taxonomy_node_get_terms($node->nid);
+      }
+      else {
+        $terms = array();
+      }
+    }
+    else {
+      $terms = $node->taxonomy;
+    }
+
+    $c = db_query(db_rewrite_sql("SELECT v.* FROM {vocabulary} v INNER JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE n.type = '%s' ORDER BY v.weight, v.name", 'v', 'vid'), $node->type);
+
+    while ($vocabulary = db_fetch_object($c)) {
+      if ($vocabulary->tags) {
+        $typed_terms = array();
+        foreach ($terms as $term) {
+          // Extract terms belonging to the vocabulary in question.
+          if ($term->vid == $vocabulary->vid) {
+
+            // Commas and quotes in terms are special cases, so encode 'em.
+            if (preg_match('/,/', $term->name) || preg_match('/"/', $term->name)) {
+              $term->name = '"'.preg_replace('/"/', '""', $term->name).'"';
+            }
+
+            $typed_terms[] = $term->name;
+          }
+        }
+        $typed_string = implode(', ', $typed_terms) . (array_key_exists('tags', $terms) ? $terms['tags'][$vocabulary->vid] : NULL);
+
+        if ($vocabulary->help) {
+          $help = $vocabulary->help;
+        }
+        else {
+          $help = t('A comma-separated list of terms describing this content.  Example: funny, bungee jumping, "Company, Inc.".');
+        }
+        $form['taxonomy']['tags'][$vocabulary->vid] = array('#type' => 'textfield',
+          '#title' => $vocabulary->name,
+          '#description' => $help,
+          '#required' => $vocabulary->required,
+          '#default_value' => $typed_string,
+          '#autocomplete_path' => 'taxonomy/autocomplete/'. $vocabulary->vid,
+          '#weight' => $vocabulary->weight,
+          '#maxlength' => 100,
+        );
+      }
+      else {
+        // Extract terms belonging to the vocabulary in question.
+        $default_terms = array();
+        foreach ($terms as $term) {
+          if ($term->vid == $vocabulary->vid) {
+            $default_terms[$term->tid] = $term;
+          }
+        }
+        $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, array_keys($default_terms), $vocabulary->help);
+        $form['taxonomy'][$vocabulary->vid]['#weight'] = $vocabulary->weight;
+        $form['taxonomy'][$vocabulary->vid]['#required'] = $vocabulary->required;
+      }
+    }
+    if (isset($form['taxonomy'])) {
+      $form['taxonomy'] += array('#type' => 'fieldset', '#title' => t('Categories'), '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, '#weight' => -3);
+    }
+  }
+}
+
+/**
+ * Find all terms associated to the given node, within one vocabulary.
+ */
+function taxonomy_node_get_terms_by_vocabulary($nid, $vid, $key = 'tid') {
+  $result = db_query(db_rewrite_sql('SELECT t.tid, t.* FROM {term_data} t INNER JOIN {term_node} r ON r.tid = t.tid WHERE t.vid = %d AND r.nid = %d ORDER BY weight', 't', 'tid'), $vid, $nid);
+  $terms = array();
+  while ($term = db_fetch_object($result)) {
+    $terms[$term->$key] = $term;
+  }
+  return $terms;
+}
+
+/**
+ * Find all terms associated to the given node, ordered by vocabulary and term weight.
+ */
+function taxonomy_node_get_terms($nid, $key = 'tid') {
+  static $terms;
+
+  if (!isset($terms[$nid])) {
+    $result = db_query(db_rewrite_sql('SELECT t.* FROM {term_node} r INNER JOIN {term_data} t ON r.tid = t.tid INNER JOIN {vocabulary} v ON t.vid = v.vid WHERE r.nid = %d ORDER BY v.weight, t.weight, t.name', 't', 'tid'), $nid);
+    $terms[$nid] = array();
+    while ($term = db_fetch_object($result)) {
+      $terms[$nid][$term->$key] = $term;
+    }
+  }
+  return $terms[$nid];
+}
+
+/**
+ * Make sure incoming vids are free tagging enabled.
+ */
+function taxonomy_node_validate(&$node) {
+  if ($node->taxonomy) {
+    $terms = $node->taxonomy;
+    if ($terms['tags']) {
+      foreach ($terms['tags'] as $vid => $vid_value) {
+        $vocabulary = taxonomy_get_vocabulary($vid);
+        if (!$vocabulary->tags) {
+          // see form_get_error $key = implode('][', $element['#parents']);
+          // on why this is the key
+          form_set_error("taxonomy][tags][$vid", t('The %name vocabulary can not be modified in this way.', array('%name' => theme('placeholder', $vocabulary->name))));
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Save term associations for a given node.
+ */
+function taxonomy_node_save($nid, $terms) {
+  taxonomy_node_delete($nid);
+
+  // Free tagging vocabularies do not send their tids in the form,
+  // so we'll detect them here and process them independently.
+  if (isset($terms['tags'])) {
+    $typed_input = $terms['tags'];
+    unset($terms['tags']);
+
+    foreach ($typed_input as $vid => $vid_value) {
+      // This regexp allows the following types of user input:
+      // this, "somecmpany, llc", "and ""this"" w,o.rks", foo bar
+      $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
+      preg_match_all($regexp, $vid_value, $matches);
+      $typed_terms = array_unique($matches[1]);
+
+      $inserted = array();
+      foreach ($typed_terms as $typed_term) {
+        // If a user has escaped a term (to demonstrate that it is a group,
+        // or includes a comma or quote character), we remove the escape
+        // formatting so to save the term into the DB as the user intends.
+        $typed_term = str_replace('""', '"', preg_replace('/^"(.*)"$/', '\1', $typed_term));
+        $typed_term = trim($typed_term);
+        if ($typed_term == "") { continue; }
+
+        // See if the term exists in the chosen vocabulary
+        // and return the tid, otherwise, add a new record.
+        $possibilities = taxonomy_get_term_by_name($typed_term);
+        $typed_term_tid = NULL; // tid match if any.
+        foreach ($possibilities as $possibility) {
+          if ($possibility->vid == $vid) {
+            $typed_term_tid = $possibility->tid;
+          }
+        }
+
+        if (!$typed_term_tid) {
+          $edit = array('vid' => $vid, 'name' => $typed_term);
+          $status = taxonomy_save_term($edit);
+          $typed_term_tid = $edit['tid'];
+        }
+
+        // defend against duplicate, different cased tags
+        if (!isset($inserted[$typed_term_tid])) {
+          db_query('INSERT INTO {term_node} (nid, tid) VALUES (%d, %d)', $nid, $typed_term_tid);
+          $inserted[$typed_term_tid] = TRUE;
+        }
+      }
+    }
+  }
+
+  if (is_array($terms)) {
+    foreach ($terms as $term) {
+      if (is_array($term)) {
+        foreach ($term as $tid) {
+          if ($tid) {
+            db_query('INSERT INTO {term_node} (nid, tid) VALUES (%d, %d)', $nid, $tid);
+          }
+        }
+      }
+      else if (is_object($term)) {
+        db_query('INSERT INTO {term_node} (nid, tid) VALUES (%d, %d)', $nid, $term->tid);
+      }
+      else if ($term) {
+        db_query('INSERT INTO {term_node} (nid, tid) VALUES (%d, %d)', $nid, $term);
+      }
+    }
+  }
+}
+
+/**
+ * Remove associations of a node to its terms.
+ */
+function taxonomy_node_delete($nid) {
+  db_query('DELETE FROM {term_node} WHERE nid = %d', $nid);
+}
+
+/**
+ * Find all term objects related to a given term ID.
+ */
+function taxonomy_get_related($tid, $key = 'tid') {
+  if ($tid) {
+    $result = db_query('SELECT t.*, tid1, tid2 FROM {term_relation}, {term_data} t WHERE (t.tid = tid1 OR t.tid = tid2) AND (tid1 = %d OR tid2 = %d) AND t.tid != %d ORDER BY weight, name', $tid, $tid, $tid);
+    $related = array();
+    while ($term = db_fetch_object($result)) {
+      $related[$term->$key] = $term;
+    }
+    return $related;
+  }
+  else {
+    return array();
+  }
+}
+
+/**
+ * Find all parents of a given term ID.
+ */
+function taxonomy_get_parents($tid, $key = 'tid') {
+  if ($tid) {
+    $result = db_query(db_rewrite_sql('SELECT t.tid, t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON h.parent = t.tid WHERE h.tid = %d ORDER BY weight, name', 't', 'tid'), $tid);
+    $parents = array();
+    while ($parent = db_fetch_object($result)) {
+      $parents[$parent->$key] = $parent;
+    }
+    return $parents;
+  }
+  else {
+    return array();
+  }
+}
+
+/**
+ * Find all ancestors of a given term ID.
+ */
+function taxonomy_get_parents_all($tid) {
+  $parents = array();
+  if ($tid) {
+    $parents[] = taxonomy_get_term($tid);
+    $n = 0;
+    while ($parent = taxonomy_get_parents($parents[$n]->tid)) {
+      $parents = array_merge($parents, $parent);
+      $n++;
+    }
+  }
+  return $parents;
+}
+
+/**
+ * Find all children of a term ID.
+ */
+function taxonomy_get_children($tid, $vid = 0, $key = 'tid') {
+  if ($vid) {
+    $result = db_query(db_rewrite_sql('SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON h.tid = t.tid WHERE t.vid = %d AND h.parent = %d ORDER BY weight, name', 't', 'tid'), $vid, $tid);
+  }
+  else {
+    $result = db_query(db_rewrite_sql('SELECT t.* FROM {term_data} t INNER JOIN {term_hierarchy} h ON h.tid = t.tid WHERE parent = %d ORDER BY weight, name', 't', 'tid'), $tid);
+  }
+  $children = array();
+  while ($term = db_fetch_object($result)) {
+    $children[$term->$key] = $term;
+  }
+  return $children;
+}
+
+/**
+ * Create a hierarchical representation of a vocabulary.
+ *
+ * @param $vid
+ *   Which vocabulary to generate the tree for.
+ *
+ * @param $parent
+ *   The term ID under which to generate the tree. If 0, generate the tree
+ *   for the entire vocabulary.
+ *
+ * @param $depth
+ *   Internal use only.
+ *
+ * @param $max_depth
+ *   The number of levels of the tree to return. Leave NULL to return all levels.
+ *
+ * @return
+ *   An array of all term objects in the tree. Each term object is extended
+ *   to have "depth" and "parents" attributes in addition to its normal ones.
+ */
+function taxonomy_get_tree($vid, $parent = 0, $depth = -1, $max_depth = NULL) {
+  static $children, $parents, $terms;
+
+  $depth++;
+
+  // We cache trees, so it's not CPU-intensive to call get_tree() on a term
+  // and its children, too.
+  if (!isset($children[$vid])) {
+    $children[$vid] = array();
+
+    $result = db_query(db_rewrite_sql('SELECT t.tid, t.*, parent FROM {term_data} t INNER JOIN  {term_hierarchy} h ON t.tid = h.tid WHERE t.vid = %d ORDER BY weight, name', 't', 'tid'), $vid);
+    while ($term = db_fetch_object($result)) {
+      $children[$vid][$term->parent][] = $term->tid;
+      $parents[$vid][$term->tid][] = $term->parent;
+      $terms[$vid][$term->tid] = $term;
+    }
+  }
+
+  $max_depth = (is_null($max_depth)) ? count($children[$vid]) : $max_depth;
+  if ($children[$vid][$parent]) {
+    foreach ($children[$vid][$parent] as $child) {
+      if ($max_depth > $depth) {
+        $terms[$vid][$child]->depth = $depth;
+        // The "parent" attribute is not useful, as it would show one parent only.
+        unset($terms[$vid][$child]->parent);
+        $terms[$vid][$child]->parents = $parents[$vid][$child];
+        $tree[] = $terms[$vid][$child];
+
+        if ($children[$vid][$child]) {
+          $tree = array_merge($tree, taxonomy_get_tree($vid, $child, $depth, $max_depth));
+        }
+      }
+    }
+  }
+
+  return $tree ? $tree : array();
+}
+
+/**
+ * Return an array of synonyms of the given term ID.
+ */
+function taxonomy_get_synonyms($tid) {
+  if ($tid) {
+    $result = db_query('SELECT name FROM {term_synonym} WHERE tid = %d', $tid);
+    while ($synonym = db_fetch_array($result)) {
+      $synonyms[] = $synonym['name'];
+    }
+    return $synonyms ? $synonyms : array();
+  }
+  else {
+    return array();
+  }
+}
+
+/**
+ * Return the term object that has the given string as a synonym.
+ */
+function taxonomy_get_synonym_root($synonym) {
+  return db_fetch_object(db_query("SELECT * FROM {term_synonym} s, {term_data} t WHERE t.tid = s.tid AND s.name = '%s'", $synonym));
+}
+
+/**
+ * Given a term id, count the number of published nodes in it.
+ */
+function taxonomy_term_count_nodes($tid, $type = 0) {
+  static $count;
+
+  if (!isset($count[$type])) {
+    // $type == 0 always evaluates true is $type is a string
+    if (is_numeric($type)) {
+      $result = db_query(db_rewrite_sql('SELECT t.tid, COUNT(n.nid) AS c FROM {term_node} t INNER JOIN {node} n ON t.nid = n.nid WHERE n.status = 1 GROUP BY t.tid'));
+    }
+    else {
+      $result = db_query(db_rewrite_sql("SELECT t.tid, COUNT(n.nid) AS c FROM {term_node} t INNER JOIN {node} n ON t.nid = n.nid WHERE n.status = 1 AND n.type = '%s' GROUP BY t.tid"), $type);
+    }
+    while ($term = db_fetch_object($result)) {
+      $count[$type][$term->tid] = $term->c;
+    }
+  }
+
+  foreach (_taxonomy_term_children($tid) as $c) {
+    $children_count += taxonomy_term_count_nodes($c, $type);
+  }
+  return $count[$type][$tid] + $children_count;
+}
+
+/**
+ * Helper for taxonomy_term_count_nodes().
+ */
+function _taxonomy_term_children($tid) {
+  static $children;
+
+  if (!isset($children)) {
+    $result = db_query('SELECT tid, parent FROM {term_hierarchy}');
+    while ($term = db_fetch_object($result)) {
+      $children[$term->parent][] = $term->tid;
+    }
+  }
+  return $children[$tid] ? $children[$tid] : array();
+}
+
+/**
+ * Try to map a string to an existing term, as for glossary use.
+ *
+ * Provides a case-insensitive and trimmed mapping, to maximize the
+ * likelihood of a successful match.
+ *
+ * @param name
+ *   Name of the term to search for.
+ *
+ * @return
+ *   An array of matching term objects.
+ */
+function taxonomy_get_term_by_name($name) {
+  $db_result = db_query(db_rewrite_sql("SELECT t.tid, t.* FROM {term_data} t WHERE LOWER('%s') LIKE LOWER(t.name)", 't', 'tid'), trim($name));
+  $result = array();
+  while ($term = db_fetch_object($db_result)) {
+    $result[] = $term;
+  }
+
+  return $result;
+}
+
+/**
+ * Return the vocabulary object matching a vocabulary ID.
+ */
+function taxonomy_get_vocabulary($vid) {
+  static $vocabularies = array();
+
+  if (!array_key_exists($vid, $vocabularies)) {
+    $result = db_query('SELECT v.*, n.type FROM {vocabulary} v LEFT JOIN {vocabulary_node_types} n ON v.vid = n.vid WHERE v.vid = %d ORDER BY v.weight, v.name', $vid);
+    $node_types = array();
+    while ($voc = db_fetch_object($result)) {
+      $node_types[] = $voc->type;
+      unset($voc->type);
+      $voc->nodes = $node_types;
+      $vocabularies[$vid] = $voc;
+    }
+  }
+
+  return $vocabularies[$vid];
+}
+
+/**
+ * Return the term object matching a term ID.
+ */
+function taxonomy_get_term($tid) {
+  // simple cache using a static var?
+  return db_fetch_object(db_query('SELECT * FROM {term_data} WHERE tid = %d', $tid));
+}
+
+function _taxonomy_term_select($title, $name, $value, $vocabulary_id, $description, $multiple, $blank, $exclude = array()) {
+  $tree = taxonomy_get_tree($vocabulary_id);
+  $options = array();
+
+  if ($blank) {
+    $options[0] = $blank;
+  }
+  if ($tree) {
+    foreach ($tree as $term) {
+      if (!in_array($term->tid, $exclude)) {
+        $options[$term->tid] = _taxonomy_depth($term->depth, '-') . $term->name;
+      }
+    }
+    if (!$blank && !$value) {
+      // required but without a predefined value, so set first as predefined
+      $value = $tree[0]->tid;
+    }
+  }
+
+  return array('#type' => 'select',
+    '#title' => $title,
+    '#default_value' => $value,
+    '#options' => $options,
+    '#description' => $description,
+    '#multiple' => $multiple,
+    '#size' => $multiple ? min(9, count($options)) : 0,
+    '#weight' => -15,
+    '#theme' => 'taxonomy_term_select',
+  );
+}
+
+function theme_taxonomy_term_select($element) {
+  return theme('select', $element);
+}
+
+function _taxonomy_depth($depth, $graphic = '--') {
+  for ($n = 0; $n < $depth; $n++) {
+    $result .= $graphic;
+  }
+  return $result;
+}
+
+/**
+ * Finds all nodes that match selected taxonomy conditions.
+ *
+ * @param $tids
+ *   An array of term IDs to match.
+ * @param $operator
+ *   How to interpret multiple IDs in the array. Can be "or" or "and".
+ * @param $depth
+ *   How many levels deep to traverse the taxonomy tree. Can be a nonnegative
+ *   integer or "all".
+ * @param $pager
+ *   Whether the nodes are to be used with a pager (the case on most Drupal
+ *   pages) or not (in an XML feed, for example).
+ * @param $order
+ *   The order clause for the query that retrieve the nodes.
+ * @return
+ *   A resource identifier pointing to the query results.
+ */
+function taxonomy_select_nodes($tids = array(), $operator = 'or', $depth = 0, $pager = TRUE, $order = 'n.sticky DESC, n.created DESC') {
+  if (count($tids) > 0) {
+    // For each term ID, generate an array of descendant term IDs to the right depth.
+    $descendant_tids = array();
+    if ($depth === 'all') {
+      $depth = NULL;
+    }
+    foreach ($tids as $index => $tid) {
+      $term = taxonomy_get_term($tid);
+      $tree = taxonomy_get_tree($term->vid, $tid, -1, $depth);
+      $descendant_tids[] = array_merge(array($tid), array_map('_taxonomy_get_tid_from_term', $tree));
+    }
+
+    if ($operator == 'or') {
+      $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));
+      $sql = 'SELECT DISTINCT(n.nid), n.sticky, n.title, n.created FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid WHERE tn.tid IN ('. $str_tids .') AND n.status = 1 ORDER BY '. $order;
+      $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid WHERE tn.tid IN ('. $str_tids .') AND n.status = 1';
+    }
+    else {
+      $joins = '';
+      $wheres = '';
+      foreach ($descendant_tids as $index => $tids) {
+        $joins .= ' INNER JOIN {term_node} tn'. $index .' ON n.nid = tn'. $index .'.nid';
+        $wheres .= ' AND tn'. $index .'.tid IN ('. implode(',', $tids) .')';
+      }
+      $sql = 'SELECT DISTINCT(n.nid), n.sticky, n.title, n.created FROM {node} n '. $joins .' WHERE n.status = 1 '. $wheres .' ORDER BY '. $order;
+      $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n '. $joins .' WHERE n.status = 1 ' . $wheres;
+    }
+    $sql = db_rewrite_sql($sql);
+    $sql_count = db_rewrite_sql($sql_count);
+    if ($pager) {
+      $result = pager_query($sql, variable_get('default_nodes_main', 10), 0, $sql_count);
+    }
+    else {
+      $result = db_query_range($sql, 0, variable_get('feed_default_items', 10));
+    }
+  }
+
+  return $result;
+}
+
+/**
+ * Accepts the result of a pager_query() call, such as that performed by
+ * taxonomy_select_nodes(), and formats each node along with a pager.
+*/
+function taxonomy_render_nodes($result) {
+  if (db_num_rows($result) > 0) {
+    while ($node = db_fetch_object($result)) {
+      $output .= node_view(node_load($node->nid), 1);
+    }
+    $output .= theme('pager', NULL, variable_get('default_nodes_main', 10), 0);
+  }
+  else {
+    $output .= t('There are currently no posts in this category.');
+  }
+  return $output;
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ */
+function taxonomy_nodeapi($node, $op, $arg = 0) {
+  switch ($op) {
+    case 'load':
+     $output['taxonomy'] = taxonomy_node_get_terms($node->nid);
+     return $output;
+    case 'insert':
+      taxonomy_node_save($node->nid, $node->taxonomy);
+      break;
+    case 'update':
+      taxonomy_node_save($node->nid, $node->taxonomy);
+      break;
+    case 'delete':
+      taxonomy_node_delete($node->nid);
+      break;
+    case 'validate':
+      taxonomy_node_validate($node);
+      break;
+    case 'rss item':
+      return taxonomy_rss_item($node);
+    case 'update index':
+      return taxonomy_node_update_index($node);
+  }
+}
+
+/**
+ * Implementation of hook_nodeapi('update_index').
+ */
+function taxonomy_node_update_index(&$node) {
+  $output = array();
+  foreach ($node->taxonomy as $term) {
+    $output[] = $term->name;
+  }
+  if (count($output)) {
+    return '('. implode(', ', $output) .')';
+  }
+}
+
+/**
+ * Menu callback; displays all nodes associated with a term.
+ */
+function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
+  if (preg_match('/^([0-9]+[+ ])+[0-9]+$/', $str_tids)) {
+    $operator = 'or';
+    // The '+' character in a query string may be parsed as ' '.
+    $tids = preg_split('/[+ ]/', $str_tids);
+  }
+  else if (preg_match('/^([0-9]+,)*[0-9]+$/', $str_tids)) {
+    $operator = 'and';
+    $tids = explode(',', $str_tids);
+  }
+  else {
+    drupal_not_found();
+  }
+
+  if ($tids) {
+    $result = db_query(db_rewrite_sql('SELECT t.tid, t.name FROM {term_data} t WHERE t.tid IN (%s)', 't', 'tid'), implode(',', $tids));
+    $tids = array(); // we rebuild the $tids-array so it only contains terms the user has access to.
+    $names = array();
+    while ($term = db_fetch_object($result)) {
+      $tids[] = $term->tid;
+      $names[] = $term->name;
+    }
+
+    if ($names) {
+      drupal_set_title($title = check_plain(implode(', ', $names)));
+
+      switch ($op) {
+        case 'page':
+          // Build breadcrumb based on first hierarchy of first term:
+          $current->tid = $tids[0];
+          $breadcrumbs = array(array('path' => $_GET['q']));
+          while ($parents = taxonomy_get_parents($current->tid)) {
+            $current = array_shift($parents);
+            $breadcrumbs[] = array('path' => 'taxonomy/term/'. $current->tid, 'title' => $current->name);
+          }
+          $breadcrumbs = array_reverse($breadcrumbs);
+          menu_set_location($breadcrumbs);
+
+          drupal_add_link(array('rel' => 'alternate',
+                                'type' => 'application/rss+xml',
+                                'title' => 'RSS - '. $title,
+                                'href' => url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed')));
+
+          $output = taxonomy_render_nodes(taxonomy_select_nodes($tids, $operator, $depth, TRUE));
+          $output .= theme('feed_icon', url('taxonomy/term/'. $str_tids .'/'. $depth .'/feed'));
+          return $output;
+          break;
+
+        case 'feed':
+          $term = taxonomy_get_term($tids[0]);
+          $channel['link'] = url('taxonomy/term/'. $str_tids .'/'. $depth, NULL, NULL, TRUE);
+          $channel['title'] = variable_get('site_name', 'drupal') .' - '. $title;
+          $channel['description'] = $term->description;
+
+          $result = taxonomy_select_nodes($tids, $operator, $depth, FALSE);
+          node_feed($result, $channel);
+          break;
+        default:
+          drupal_not_found();
+      }
+    }
+    else {
+      drupal_not_found();
+    }
+  }
+}
+
+/**
+ * Page to add or edit a vocabulary
+ */
+function taxonomy_admin_vocabulary_edit($vid = NULL) {
+  if ($_POST['op'] == t('Delete') || $_POST['edit']['confirm']) {
+    return _taxonomy_confirm_del_vocabulary($vid);
+  }
+  elseif ($vid) {
+    $vocabulary = (array)taxonomy_get_vocabulary($vid);
+  }
+  return taxonomy_form_vocabulary($vocabulary);
+}
+
+/**
+ * Page to list terms for a vocabulary
+ */
+function taxonomy_admin_term_edit($tid = NULL) {
+  if ($_POST['op'] == t('Delete') || $_POST['edit']['confirm']) {
+    return _taxonomy_confirm_del_term($tid);
+  }
+  elseif ($tid) {
+    $term = (array)taxonomy_get_term($tid);
+  }
+  return taxonomy_form_term($term);
+}
+
+/**
+ * Provides category information for rss feeds
+ */
+function taxonomy_rss_item($node) {
+  $output = array();
+  foreach ($node->taxonomy as $term) {
+    $output[] = array('key'   => 'category',
+                      'value' => check_plain($term->name),
+                      'attributes' => array('domain' => url('taxonomy/term/'. $term->tid, NULL, NULL, TRUE)));
+  }
+  return $output;
+}
+
+/**
+ * Implementation of hook_help().
+ */
+function taxonomy_help($section) {
+  switch ($section) {
+    case 'admin/help#taxonomy':
+      $output = '
                          '. t('The taxonomy module is one of the most popular features because users often want to create categories to organize content by type. It can automatically classify new content, which is very useful for organizing content on-the-fly. A simple example would be organizing a list of music reviews by musical genre.') .'
                          ';
+      $output .= '
                          '. t('Taxonomy is also the study of classification. The taxonomy module allows you to define vocabularies (sets of categories) which are used to classify content. The module supports hierarchical classification and association between terms, allowing for truly flexible information retrieval and classification. The taxonomy module allows multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms) and taxonomies (controlled vocabularies where relationships are indicated hierarchically). To view and manage the terms of each vocabulary, click on the associated list terms link. To delete a vocabulary and all its terms, choose edit vocabulary.') .'
                          ';
+      $output .= '
                          '. t('A controlled vocabulary is a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot\'s sections. For more complex implementations, you might create a hierarchical list of categories.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%admin-taxonomy-add-vocabulary' => url('admin/taxonomy/add/vocabulary'), '%admin-taxonomy' => url('admin/taxonomy'), '%external-http-drupal-org-project-taxonomy_access' => 'http://drupal.org/project/taxonomy_access', '%external-http-drupal-org-project-taxonomy_browser' => 'http://drupal.org/project/taxonomy_browser'));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Taxonomy page.', array('%taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Enables the categorization of content.');
+    case 'admin/taxonomy':
+      return t('
                          The taxonomy module allows you to classify content into categories and subcategories; it allows multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms), taxonomies (controlled vocabularies where relationships are indicated hierarchically), and free vocabularies where terms, or tags, are defined during content creation. To view and manage the terms of each vocabulary, click on the associated list terms link. To delete a vocabulary and all its terms, choose "edit vocabulary".
                          ');
+    case 'admin/taxonomy/add/vocabulary':
+      return t("
                          When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo).  Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot.org's or Kuro5hin.org's sections. For more complex implementations, you might create a hierarchical list of categories.
                          ");
+  }
+}
+
+/**
+ * Helper function for array_map purposes.
+ */
+function _taxonomy_get_tid_from_term($term) {
+  return $term->tid;
+}
+
+/**
+ * Helper function for autocompletion
+ */
+function taxonomy_autocomplete($vid, $string = '') {
+  // The user enters a comma-separated list of tags. We only autocomplete the last tag.
+  // This regexp allows the following types of user input:
+  // this, "somecmpany, llc", "and ""this"" w,o.rks", foo bar
+  $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
+  preg_match_all($regexp, $string, $matches);
+  $array = $matches[1];
+
+  // Fetch last tag
+  $last_string = trim(array_pop($array));
+  if ($last_string != '') {
+    $result = db_query_range(db_rewrite_sql("SELECT t.tid, t.name FROM {term_data} t WHERE t.vid = %d AND LOWER(t.name) LIKE LOWER('%%%s%%')", 't', 'tid'), $vid, $last_string, 0, 10);
+
+    $prefix = count($array) ? implode(', ', $array) .', ' : '';
+
+    $matches = array();
+    while ($tag = db_fetch_object($result)) {
+      $n = $tag->name;
+      // Commas and quotes in terms are special cases, so encode 'em.
+      if (preg_match('/,/', $tag->name) || preg_match('/"/', $tag->name)) {
+        $n = '"'. preg_replace('/"/', '""', $tag->name) .'"';
+      }
+      $matches[$prefix . $n] = check_plain($tag->name);
+    }
+    print drupal_to_js($matches);
+    exit();
+  }
+}
diff --git a/modules/taxonomy_block/LICENSE.txt b/modules/taxonomy_block/LICENSE.txt
new file mode 100644
index 0000000..2c095c8
--- /dev/null
+++ b/modules/taxonomy_block/LICENSE.txt
@@ -0,0 +1,274 @@
+GNU GENERAL PUBLIC LICENSE
+
+              Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
+Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
+verbatim copies of this license document, but changing it is not allowed.
+
+                  Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software and to any other
+program whose authors commit to using it. (Some other Free Software
+Foundation software is covered by the GNU Library General Public License
+instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this service if
+you wish), that you receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free programs; and that
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients
+to know that what they have is not the original, so that any problems
+introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+           GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+               MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms
+of this General Public License. The "Program", below, refers to any such
+program or work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is to say, a work
+containing the Program or a portion of it, either verbatim or with
+modifications and/or translated into another language. (Hereinafter, translation
+is included without limitation in the term "modification".) Each licensee is
+addressed as "you".
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made
+by running the Program). Whether that is true depends on what the Program
+does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you
+also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that
+you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in
+part contains or is derived from the Program or any part thereof, to be
+licensed as a whole at no charge to all third parties under the terms of this
+License.
+
+c) If the modified program normally reads commands interactively when run,
+you must cause it, when started running for such interactive use in the most
+ordinary way, to print or display an announcement including an appropriate
+copyright notice and a notice that there is no warranty (or else, saying that
+you provide a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this License.
+(Exception: if the Program itself is interactive but does not normally print such
+an announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be
+reasonably considered independent and separate works in themselves, then
+this License, and its terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same sections as part
+of a whole which is a work based on the Program, the distribution of the
+whole must be on the terms of this License, whose permissions for other
+licensees extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to
+work written entirely by you; rather, the intent is to exercise the right to
+control the distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the scope
+of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1
+and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2 above
+on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give
+any third party, for a charge no more than your cost of physically performing
+source distribution, a complete machine-readable copy of the corresponding
+source code, to be distributed under the terms of Sections 1 and 2 above on
+a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute
+corresponding source code. (This alternative is allowed only for
+noncommercial distribution and only if you received the program in object
+code or executable form with such an offer, in accord with Subsection b
+above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation and
+installation of the executable. However, as a special exception, the source
+code distributed need not include anything that is normally distributed (in
+either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to
+copy from a designated place, then offering equivalent access to copy the
+source code from the same place counts as distribution of the source code,
+even though third parties are not compelled to copy the source along with the
+object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense or distribute the Program is void, and will automatically
+terminate your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the
+Program (or any work based on the Program), you indicate your acceptance
+of this License to do so, and all its terms and conditions for copying,
+distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that
+version or of any later version published by the Free Software Foundation. If
+the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make
+exceptions for this. Our decision will be guided by the two goals of
+preserving the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+
+               NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
+AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
+ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
+LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES
+SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
+IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.
+
+          END OF TERMS AND CONDITIONS
diff --git a/modules/taxonomy_block/README.txt b/modules/taxonomy_block/README.txt
new file mode 100644
index 0000000..39ac160
--- /dev/null
+++ b/modules/taxonomy_block/README.txt
@@ -0,0 +1,5 @@
+This is a simple module to create blocks based on taxonomy. It displays listings of recently posted nodes based on taxonomy definitions. You can create as many blocks as you like.
+
+Send comments to welch@advomatic.com
+
+Originally developed for stagespace.com by Aaron Welch (crunchywelch) at Advomatic LLC
diff --git a/modules/taxonomy_block/taxonomy_block.install b/modules/taxonomy_block/taxonomy_block.install
new file mode 100644
index 0000000..e112759
--- /dev/null
+++ b/modules/taxonomy_block/taxonomy_block.install
@@ -0,0 +1,46 @@
+ 'admin/block/taxonomy_block', 'title' => t('taxonomy block'), 'callback' => 'taxonomy_block_admin', 'access' => user_access('administer taxonomy blocks'));
+    $items[] = array('path' => 'admin/block/taxonomy_block/edit', 'title' => t('edit taxonomy block'), 'callback' => 'taxonomy_block_form', 'access' => user_access('administer taxonomy blocks'), 'type' => MENU_CALLBACK);
+  }
+
+  return $items;
+}
+
+/**
+ * Implementation of hook_block.
+ */
+function taxonomy_block_block($op = 'list', $delta = 0) {
+  switch ($op) {
+    case 'list':
+      return taxonomy_block_get_blocks();
+      break;
+    case 'view':
+      return taxonomy_block_get_block($delta);
+      break;
+  }
+}
+
+/**
+ * Displays the administrator page to this module.
+ */
+function taxonomy_block_admin($op = NULL, $bid = NULL) {
+  switch ($op) {
+    case 'delete' :
+      $form['bid'] = array(
+        '#type' => 'hidden',
+        '#value' => $bid,
+        );
+      $output = confirm_form('taxonomy_block_delete_form', $form, t('Are you sure you want to delete the taxonomy block?'), 'admin/block/taxonomy_block');
+      break;
+    default:
+      $output = taxonomy_block_blocks();
+      $output .= taxonomy_block_form();
+      break;
+  }
+
+  drupal_set_title(t('Taxonomy Block Administration'));
+  return $output;
+}
+
+/**
+ * Inserts a block into the database.
+ */
+function taxonomy_block_insert($edit) {
+  $sql = 'INSERT INTO {taxonomy_block} (tid, name, description, length, type, teaser) VALUES (%d, \'%s\', \'%s\', %d, \'%s\', %d)';
+  db_query($sql, $edit['tid'], $edit['name'], $edit['description'], $edit['length'], $edit['type'], $edit['teaser']);
+  drupal_set_message(t('Created taxonomy block'));
+}
+
+/**
+ * Updates a block in the database.
+ */
+function taxonomy_block_update($edit) {
+  $sql = 'UPDATE {taxonomy_block} SET tid = %d, name = \'%s\', description = \'%s\', length = %d, type = \'%s\', teaser = %d WHERE bid = %d';
+  db_query($sql, $edit['tid'], $edit['name'], $edit['description'], $edit['length'], $edit['type'], $edit['teaser'], $edit['bid']);
+  drupal_set_message(t('Updated taxonomy block'));
+}
+
+/**
+ * Deletes a block from the database.
+ */
+function taxonomy_block_delete($bid) {
+  db_query('DELETE FROM {taxonomy_block} WHERE bid = %d', $bid);
+}
+
+/**
+* Displays the block creation form.
+*/
+function taxonomy_block_form($bid = NULL) {
+  if ($bid) {
+    $block = db_fetch_object(db_query('SELECT * FROM {taxonomy_block} WHERE bid = %d', $bid));
+  }
+
+  $form['create_taxonomy_block'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Create Block'),
+    );
+  $form['create_taxonomy_block']['bid'] = array(
+    '#type' => 'hidden',
+    '#value' => $bid,
+  );
+  $form['create_taxonomy_block']['name'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Block Name'),
+    '#default_value' => $block->name,
+    '#description' => t('This is the name of your block.'),
+    );
+  $form['create_taxonomy_block']['description'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Block Description'),
+    '#default_value' => $block->description,
+    '#description' => t('This is the description of your block. It is not displayed to users.'),
+    '#required' => TRUE,
+    );
+  $form['create_taxonomy_block']['teaser'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Teaser Length'),
+    '#default_value' => $block->teaser,
+    '#description' => t('This is the length of node body content to display under each title in characters. Leave blank for none.'),
+    );
+  $form['create_taxonomy_block']['length'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Node Count'),
+    '#default_value' => $block->length,
+    '#description' => t('This is the number of nodes to display.'),
+    '#required' => TRUE,
+    );
+
+  $form['create_taxonomy_block']['tid'] = _taxonomy_block_get_taxonomy_dropdown($block->type == 'vocabulary' ? 'v'. $block->tid : $block->tid);
+
+  if($bid) {
+    $form['create_taxonomy_block'][] = array(
+      '#type' => 'submit',
+      '#value' => t('Edit Block'),
+      );
+    $form['create_taxonomy_block'][] = array(
+      '#type' => 'submit',
+      '#value' => t('Cancel'),
+      );
+  }
+  else {
+    $form['create_taxonomy_block'][] = array(
+      '#type' => 'submit',
+      '#value' => t('Create Block'),
+      );
+  }
+
+  return drupal_get_form('taxonomy_block_form', $form);
+}
+
+/**
+ * taxonomy_block_form form validate callback function.
+ */
+function taxonomy_block_form_validate($form_id, $edit) {
+  if(!$edit['description']) {
+    form_set_error('description', t('Please provide a description for your block. It will be used in administration screens only.'));
+  }
+  if($edit['length'] <=0) {
+    form_set_error('length', t('Please provide a node count greater than 0.'));
+  }
+  if(!$edit['tid']) {
+    form_set_error('tid', t('Please select a category for your block to display.'));
+  }
+}
+/**
+ * taxonomy_block_form form execute callback function.
+ */
+function taxonomy_block_form_submit($form_id, $edit) {
+  $op = $_POST['op'];
+
+  if(substr($edit['tid'], 0, 1)=='v') {
+    $edit['type'] = 'vocabulary';
+    $edit['tid'] = substr($edit['tid'], 1);
+  }
+  else {
+    $edit['type'] = 'term';
+  }
+
+  if($op == t('Create Block')) {
+    taxonomy_block_insert($edit);
+  }
+  elseif($op == t('Edit Block')) {
+    taxonomy_block_update($edit);
+  }
+  drupal_goto('admin/block/taxonomy_block');
+}
+
+function taxonomy_block_delete_form_submit($form_id, $edit) {
+  taxonomy_block_delete($edit['bid']);
+  drupal_set_message(t('The block has been deleted.'));
+  drupal_goto('admin/block/taxonomy_block');
+}
+
+/**
+* Displays a list of the blocks.
+*/
+function taxonomy_block_blocks() {
+  $result = db_query('SELECT * FROM {taxonomy_block}');
+  while ($block = db_fetch_object($result)) {
+    $links = array();
+    $links[] = l(t('edit'), 'admin/block/taxonomy_block/edit/'. $block->bid, array('title'=>t('edit block')));;
+    $links[] = l(t('delete'), 'admin/block/taxonomy_block/delete/'. $block->bid, array('title'=>t('delete block')));;
+    $blocks[] = $block->description .' - '. theme('links', $links);
+  }
+
+  $form['show_taxonomy_block'][] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Current Blocks'),
+    '#value' => theme('item_list', $blocks),
+    );
+
+  return drupal_get_form('taxonomy_block_admin', $form);
+}
+
+/**
+* Returns the requested block by $bid.
+*/
+function taxonomy_block_get_block($bid) {
+  $tids = array();
+  $result = db_fetch_object(db_query('SELECT * FROM {taxonomy_block} WHERE bid = %d', $bid));
+  if ($result) {
+    if ($result->type == 'term') {
+      $tids = taxonomy_get_children($result->tid);
+      $tids[$result->tid] = $result->tid;
+    }
+    else {
+      $tids = taxonomy_get_children(0, $result->tid);
+    }
+
+    $nodes = db_query(db_rewrite_sql('SELECT DISTINCT(n.nid), n.title, r.body, n.sticky, n.created FROM {term_node} t INNER JOIN {node} n ON t.nid = n.nid INNER JOIN {node_revisions} r ON r.vid = n.vid WHERE t.tid IN (%s) AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC LIMIT %d'), implode(array_keys($tids), ','), $result->length);
+
+    $block['subject'] = $result->name;
+
+    while ($node = db_fetch_object($nodes)) {
+      if($result->teaser) {
+        $teaser = strip_tags(substr($node->body, 0, $result->teaser) . (strlen($node->body) > $result->teaser ? '...' : ''));
+      }
+      $items .= theme('taxonomy_block_list_item', $node, $teaser);
+    }
+    $content = theme('taxonomy_block_list', $items);
+
+    $content .= '
                          ';
+    $content .= l(t("more"), 'taxonomy/term/'. implode(array_keys($tids), '+'), array("title" => t("View all."))) .'
                          ';
+    $block['content'] = $content;
+    return $block;
+  }
+  else {
+    return null;
+  }
+}
+
+/**
+* Returns an array of block descriptions for the block config page.
+*/
+function taxonomy_block_get_blocks() {
+  $results = db_query('SELECT * FROM {taxonomy_block}');
+  while ($block = db_fetch_object($results)) {
+    $blocks[$block->bid]['info'] = $block->description;
+  }
+  return $blocks;
+}
+
+/**
+* Returns a dropdown event taxonomy term input control.
+*/
+function _taxonomy_block_get_taxonomy_dropdown($tid = NULL) {
+  $vocabs = taxonomy_get_vocabularies();
+
+  $links[] = '';
+  foreach ($vocabs as $vocab) {
+    $links['v'.$vocab->vid] = $vocab->name;
+    $tree = taxonomy_get_tree($vocab->vid);
+    foreach ($tree as $term) {
+      $links[$term->tid] = $vocab->name .' - '. $term->name;
+    }
+  }
+
+  return array(
+    '#type' => 'select',
+    '#title' => t('Category'),
+    '#default_value' => $tid,
+    '#options' => $links,
+    '#description' => t('Select taxonomy type to display'),
+    '#required' => TRUE,
+    );
+}
+
+/**
+ * Format a single item for a list.
+ *
+ * @ingroup themeable
+ */
+function theme_taxonomy_block_list_item($node, $teaser) {
+  $output = '
                        3. ' . l($node->title, 'node/'. $node->nid,  array('title'=>t("view {$node->title} in full") ));
+  if ($teaser) {
+    $output .= '
                          ' . $teaser;
+  }
+  $output .= '
                          4. ';
+
+  return $output;
+}
+
+/**
+ * Format the item list.
+ *
+ * @ingroup themeable
+ */
+function theme_taxonomy_block_list($items) {
+  $output = '
                            ' . $items . '
                          ';
+
+  return $output;
+}
+?>
diff --git a/modules/throttle.module b/modules/throttle.module
new file mode 100644
index 0000000..8ee565e
--- /dev/null
+++ b/modules/throttle.module
@@ -0,0 +1,158 @@
+= %d AND uid = 0', time() - $time_period));
+    }
+    else {
+      $guests = 0;
+    }
+    if ($max_users = variable_get('throttle_user', 0)) {
+      $users = db_result(db_query('SELECT COUNT(DISTINCT(uid)) AS count FROM {sessions} WHERE timestamp >= %d AND uid != 0', time() - $time_period));
+    }
+    else {
+      $users = 0;
+    }
+
+    // update the throttle status
+    $message = '';
+    if ($max_users && $users > $max_users) {
+      if (!$throttle) {
+        variable_set('throttle_level', 1);
+        $message = format_plural($users,
+                                 '1 user accessing site; throttle enabled.',
+                                 '%count users accessing site; throttle enabled.');
+      }
+    }
+    elseif ($max_guests && $guests > $max_guests) {
+      if (!$throttle) {
+        variable_set('throttle_level', 1);
+        $message = format_plural($guests,
+                                 '1 guest accessing site; throttle enabled.',
+                                 '%count guests accessing site; throttle enabled.');
+      }
+    }
+    else {
+      if ($throttle) {
+        variable_set('throttle_level', 0);
+        // Note: unorthodox format_plural() usage due to Gettext plural limitations.
+        $message = format_plural($users, '1 user', '%count users') .', ';
+        $message .= format_plural($guests, '1 guest accessing site; throttle disabled', '%count guests accessing site; throttle disabled');
+      }
+    }
+    if ($message) {
+      cache_clear_all();
+      watchdog('throttle', t('Throttle') .': '. $message);
+    }
+  }
+}
+
+function _throttle_validate($value, $form) {
+  if ($value != NULL) {
+    if (!is_numeric($value) || $value < 0) {
+      form_set_error($form, t("'%value' is not a valid auto-throttle setting.  Please enter a positive numeric value.", array('%value' => theme('placeholder', $value))));
+    }
+  }
+}
+
+/**
+ * Implementation of hook_help().
+ */
+function throttle_help($section) {
+  switch ($section) {
+    case 'admin/help#throttle':
+      $output = '
                          '. t('The throttle module provides a congestion control throttling mechanism for automatically detecting a surge in incoming traffic. If the site gets linked to by a popular website, or otherwise comes under a "Denial of Service" (DoS) attack, your webserver might become overwhelmed. This mechanism is utilized by other modules to automatically optimize their performance by temporarily disabling CPU-intensive functionality.  For example, in the site theme, you might choose to disable pictures when the site is too busy (reducing bandwidth), or in modules, you might choose to disable some complicated logic (reducing CPU utilization).') .'
                          ';
+      $output .= '
                          '. t('The congestion control throttle can be automatically enabled when the number of anonymous or authenticated users currently visiting the site exceeds the specified threshold. ') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%admin-modules' => url('admin/modules'), '%admin-block' => url('admin/block'), '%admin-settings-throttle' => url('admin/settings/throttle')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Throttle page.', array('%throttle' => 'http://drupal.org/handbook/modules/throttle/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Handles the auto-throttling mechanism, to control site congestion.');
+    case 'admin/settings/throttle':
+      return t('If your site gets linked to by a popular website, or otherwise comes under a "Denial of Service" (DoS) attack, your webserver might become overwhelmed.  This module provides a congestion control throttling mechanism for automatically detecting a surge in incoming traffic.  This mechanism is utilized by other Drupal modules to automatically optimize their performance by temporarily disabling CPU-intensive functionality.');
+  }
+}
+
+/**
+ * Implementation of hook_settings().
+ */
+function throttle_settings() {
+  _throttle_validate(variable_get('throttle_anonymous', ''), 'throttle_anonymous');
+  _throttle_validate(variable_get('throttle_user', ''), 'throttle_user');
+  $probabilities = array(0 => '100%', 1 => '50%', 2 => '33.3%', 3 => '25%', 4 => '20%', 5 => '16.6%', 7 => '12.5%', 9 => '10%', 19 => '5%', 99 => '1%', 199 => '.5%', 399 => '.25%', 989 => '.1%');
+
+  $form['throttle_anonymous'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Auto-throttle on anonymous users'),
+    '#default_value' => variable_get('throttle_anonymous', 0),
+    '#size' => 5,
+    '#maxlength' => 6,
+    '#description' => t('The congestion control throttle can be automatically enabled when the number of anonymous users currently visiting your site exceeds the specified threshold.  For example, to start the throttle when your site has 250 anonymous users online at once, enter \'250\' in this field. Leave this value blank or set to "0" if you do not wish to auto-throttle on anonymous users.  You can inspect the current number of anonymous users using the "Who\'s online" block.')
+  );
+  $form['throttle_user'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Auto-throttle on authenticated users'),
+    '#default_value' => variable_get('throttle_user', 0),
+    '#size' => 5,
+    '#maxlength' => 6,
+    '#description' => t('The congestion control throttle can be automatically enabled when the number of authenticated users currently visiting your site exceeds the specified threshold.  For example, to start the throttle when your site has 50 registered users online at once, enter \'50\' in this field. Leave this value blank or set to "0" if you do not wish to auto-throttle on authenticated users.  You can inspect the current number of authenticated users using the "Who\'s online" block.')
+  );
+  $form['throttle_probability_limiter'] = array(
+    '#type' => 'select',
+    '#title' => t('Auto-throttle probability limiter'),
+    '#default_value' => variable_get('throttle_probability_limiter', 9),
+    '#options' => $probabilities,
+    '#description' => t('The auto-throttle probability limiter is an efficiency mechanism to statistically reduce the overhead of the auto-throttle.  The limiter is expressed as a percentage of page views, so for example if set to the default of 10% we only perform the extra database queries to update the throttle status 1 out of every 10 page views.  The busier your site, the lower you should set the limiter value.')
+  );
+
+  return $form;
+}
diff --git a/modules/tracker.module b/modules/tracker.module
new file mode 100644
index 0000000..96bc8fd
--- /dev/null
+++ b/modules/tracker.module
@@ -0,0 +1,129 @@
+'. t('The tracker module displays the most recently added or updated content to the website allowing users to see the most recent contributions.  The tracker module provides user level tracking for those who like to follow the contributions of particular authors.') .'
                          ';
+      $output .= '
                          '. t('The  "recent posts" page is available via a link in the navigation menu block and contains a reverse chronological list of new and recently-updated content. The table displays  the content type, the title, the author\'s name, how many comments that item has received, and when it was last updated. Updates include any changes to the text, either by the original author or someone else, as well as any new comments added to an item.  To use the tracker module to watch for a user\'s updated content, click on that user\'s profile, then the track tab.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%tracker' => url('tracker'), '%profile' => url('profile')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Tracker page.', array('%tracker' => 'http://drupal.org/handbook/modules/tracker/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Enables tracking of recent posts for users.');
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function tracker_menu($may_cache) {
+  global $user;
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'tracker', 'title' => t('recent posts'),
+      'callback' => 'tracker_page', 'access' => user_access('access content'),
+      'weight' => 1);
+
+    if ($user->uid) {
+      $items[] = array('path' => 'tracker/all', 'title' => t('all recent posts'),
+        'type' => MENU_DEFAULT_LOCAL_TASK);
+      $items[] = array('path' => 'tracker/'. $user->uid, 'title' => t('my recent posts'),
+        'type' => MENU_LOCAL_TASK);
+    }
+  }
+  else {
+    if (arg(0) == 'user' && is_numeric(arg(1))) {
+      $items[] = array('path' => 'user/'. arg(1) .'/track', 'title' => t('track'),
+          'callback' => 'tracker_track_user', 'access' => user_access('access content'),
+          'type' => MENU_IS_LOCAL_TASK);
+      $items[] = array('path' => 'user/'. arg(1) .'/track/posts', 'title' => t('track posts'),
+          'type' => MENU_DEFAULT_LOCAL_TASK);
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Menu callback. Prints a listing of active nodes on the site.
+ */
+function tracker_track_user() {
+  if ($account = user_load(array('uid' => arg(1)))) {
+    if ($account->status || user_access('administer users')) {
+      drupal_set_title($account->name);
+      return tracker_page($account->uid);
+    }
+    else {
+      drupal_access_denied();
+    }
+  }
+  else {
+    drupal_not_found();
+  }
+}
+
+/**
+ * Menu callback. Prints a listing of active nodes on the site.
+ */
+function tracker_page($uid = 0) {
+  if ($uid) {
+    $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_post DESC';
+    $sql = db_rewrite_sql($sql);
+    $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)';
+    $sql_count = db_rewrite_sql($sql_count);
+    $result = pager_query($sql, 25, 0, $sql_count, COMMENT_PUBLISHED, $uid, $uid);
+  }
+  else {
+    $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_post DESC';
+    $sql = db_rewrite_sql($sql);
+    $sql_count = 'SELECT COUNT(n.nid) FROM {node} n WHERE n.status = 1';
+    $sql_count = db_rewrite_sql($sql_count);
+    $result = pager_query($sql, 25, 0, $sql_count);
+  }
+
+  while ($node = db_fetch_object($result)) {
+    // Determine the number of comments:
+    $comments = 0;
+    if (module_exist('comment') && $node->comment_count) {
+      $comments = $node->comment_count;
+
+      if ($new = comment_num_new($node->nid)) {
+        $comments .= '
                          ';
+        $comments .= l(format_plural($new, '1 new', '%count new'), "node/$node->nid", NULL, NULL, 'new');
+      }
+    }
+
+    $rows[] = array(
+      node_get_name($node->type),
+      l($node->title, "node/$node->nid") .' '. theme('mark', node_mark($node->nid, $node->changed)),
+      theme('username', $node),
+      array('class' => 'replies', 'data' => $comments),
+      t('%time ago', array('%time' => format_interval(time() - $node->last_post)))
+    );
+  }
+
+  $header = array(t('Type'), t('Post'), t('Author'), t('Replies'), t('Last post'));
+
+  $output = '
                          ';
+  $output .= theme('table', $header, $rows);
+  $output .= theme('pager', NULL, 25, 0);
+  $output .= '
                          ';
+
+  return $output;
+}
diff --git a/modules/upload.module b/modules/upload.module
new file mode 100644
index 0000000..f03d5f3
--- /dev/null
+++ b/modules/upload.module
@@ -0,0 +1,756 @@
+'. t('The upload module allows users to upload files to the site.  The ability to upload files to a site is important for members of a community who want to share work. It is also useful to administrators who want to keep uploaded files connected to a node or page.') .'
                          ';
+      $output .= '
                          '. t('Users with the upload files permission can upload attachments. You can choose which post types can take attachments on the content types settings page.  Each user role can be customized for the file size of uploads, and the dimension of image files.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%admin-access' => url('admin/access'), '%admin-content-types' => url('admin/settings/content-types'), '%admin-upload' => url('admin/settings/upload')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Upload page.', array('%upload' => 'http://drupal.org/handbook/modules/upload/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Allows users to upload and attach files to content.');
+    case 'admin/settings/upload':
+      return t('
                          Users with the upload files permission can upload attachments. Users with the view uploaded files permission can view uploaded attachments. You can choose which post types can take attachments on the content types settings page.
                          ', array('%permissions' => url('admin/access'), '%types' => url('admin/settings/content-types')));
+  }
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function upload_perm() {
+  return array('upload files', 'view uploaded files');
+}
+
+/**
+ * Implementation of hook_link().
+ */
+function upload_link($type, $node = 0, $main = 0) {
+  $links = array();
+
+  // Display a link with the number of attachments
+  if ($main && $type == 'node' && isset($node->files) && user_access('view uploaded files')) {
+    $num_files = 0;
+    foreach ($node->files as $file) {
+      if ($file->list) {
+        $num_files++;
+      }
+    }
+    if ($num_files) {
+      $links[] = l(format_plural($num_files, '1 attachment', '%count attachments'), "node/$node->nid", array('title' => t('Read full article to view attachments.')), NULL, 'attachments');
+    }
+  }
+
+  return $links;
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function upload_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array(
+      'path' => 'upload/js',
+      'callback' => 'upload_js',
+      'access' => user_access('upload files'),
+      'type' => MENU_CALLBACK
+    );
+  }
+  else {
+    // Add handlers for previewing new uploads.
+    if (isset($_SESSION['file_previews'])) {
+      foreach ($_SESSION['file_previews'] as $fid => $file) {
+        $filename = file_create_filename($file->filename, file_create_path());
+        if (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) ==  FILE_DOWNLOADS_PRIVATE) {
+          // strip file_directory_path() from filename. @see file_create_url
+          if (strpos($filename, file_directory_path()) !== false) {
+            $filename = trim(substr($filename, strlen(file_directory_path())), '\\/');
+          }
+          $filename = 'system/files/' . $filename;
+        }
+
+        $items[] = array(
+          'path' => $filename, 'title' => t('file download'),
+          'callback' => 'upload_download',
+          'access' => user_access('view uploaded files'),
+          'type' => MENU_CALLBACK
+        );
+        $_SESSION['file_previews'][$fid]->_filename = $filename;
+      }
+    }
+  }
+
+  return $items;
+}
+
+function upload_settings() {
+  $form['settings_general'] = array('#type' => 'fieldset', '#title' => t('General settings'));
+  $form['settings_general']['upload_max_resolution'] = array(
+    '#type' => 'textfield', '#title' => t('Maximum resolution for uploaded images'), '#default_value' => variable_get('upload_max_resolution', 0),
+    '#size' => 15, '#maxlength' => 10, '#description' => t('The maximum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Set to 0 for no restriction.')
+  );
+
+  $form['settings_general']['upload_list_default'] = array('#type' => 'select', '#title' => t('List files by default'),
+    '#default_value' => variable_get('upload_list_default',1),
+    '#options' => array( 0 => t('No'), 1 => t('Yes') ),
+    '#description' => t('Set whether files attached to nodes are listed or not in the node view by default.'),
+  );
+
+  $roles = user_roles(0, 'upload files');
+
+  foreach ($roles as $rid => $role) {
+    $form["settings_role_$rid"] = array('#type' => 'fieldset', '#title' => t('Settings for %role', array('%role' => theme('placeholder', $role))), '#collapsible' => TRUE, '#collapsed' => TRUE);
+    $form["settings_role_$rid"]["upload_extensions_$rid"] = array(
+      '#type' => 'textfield', '#title' => t('Permitted file extensions'), '#default_value' => variable_get("upload_extensions_$rid", "jpg jpeg gif png txt html doc xls pdf ppt pps"),
+      '#maxlength' => 255, '#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.')
+    );
+    $form["settings_role_$rid"]["upload_uploadsize_$rid"] = array(
+      '#type' => 'textfield', '#title' => t('Maximum file size per upload'), '#default_value' => variable_get("upload_uploadsize_$rid", 1),
+      '#size' => 5, '#maxlength' => 5, '#description' => t('The maximum size of a file a user can upload (in megabytes).')
+    );
+    $form["settings_role_$rid"]["upload_usersize_$rid"] = array(
+      '#type' => 'textfield', '#title' => t('Total file size per user'), '#default_value' => variable_get("upload_usersize_$rid", 10),
+      '#size' => 5, '#maxlength' => 5, '#description' => t('The maximum size of all files a user can have on the site (in megabytes).')
+    );
+  }
+
+  return $form;
+}
+
+function upload_download() {
+  foreach ($_SESSION['file_previews'] as $file) {
+    if ($file->_filename == $_GET['q']) {
+      file_transfer($file->filepath, array('Content-Type: '. mime_header_encode($file->filemime), 'Content-Length: '. $file->filesize));
+    }
+  }
+}
+
+function upload_file_download($file) {
+  $file = file_create_path($file);
+  $result = db_query("SELECT f.* FROM {files} f WHERE filepath = '%s'", $file);
+  if ($file = db_fetch_object($result)) {
+    if (user_access('view uploaded files')) {
+      $node = node_load($file->nid);
+      if (node_access('view', $node)) {
+        $name = mime_header_encode($file->filename);
+        $type = mime_header_encode($file->filemime);
+        // Serve images and text inline for the browser to display rather than download.
+        $disposition = ereg('^(text/|image/)', $file->filemime) ? 'inline' : 'attachment';
+        return array(
+          'Content-Type: '. $type .'; name='. $name,
+          'Content-Length: '. $file->filesize,
+          'Content-Disposition: '. $disposition .'; filename='. $name
+        );
+      }
+      else {
+        return -1;
+      }
+    }
+    else {
+      return -1;
+    }
+  }
+}
+
+/**
+ * Save new uploads and attach them to the node object.
+ * append file_previews to the node object as well.
+ */
+function _upload_prepare(&$node) {
+
+  // Clean up old file previews if a post didn't get the user to this page.
+  // i.e. the user left the edit page, because they didn't want to upload anything.
+  if(count($_POST) == 0) {
+    if (is_array($_SESSION['file_previews']) && count($_SESSION['file_previews'])) {
+      foreach($_SESSION['file_previews'] as $fid => $file) {
+        file_delete($file->filepath);
+      }
+      unset($_SESSION['file_previews']);
+    }
+  }
+
+  // $_SESSION['file_current_upload'] tracks the fid of the file submitted this page request.
+  // form_builder sets the value of file->list to 0 for checkboxes added to a form after
+  // it has been submitted. Since unchecked checkboxes have no return value and do not
+  // get a key in _POST form_builder has no way of knowing the difference between a check
+  // box that wasn't present on the last form build, and a checkbox that is unchecked.
+
+  unset($_SESSION['file_current_upload']);
+
+  global $user;
+
+  // Save new file uploads to tmp dir.
+  if (($file = file_check_upload()) && user_access('upload files')) {
+
+    // Scale image uploads.
+    $file = _upload_image($file);
+
+    $key = 'upload_'. count($_SESSION['file_previews']);
+    $file->fid = $key;
+    $file->source = $key;
+    $file->list = variable_get('upload_list_default',1);
+    $_SESSION['file_previews'][$key] = $file;
+
+    // Store the uploaded fid for this page request in case of submit without
+    // preview or attach. See earlier notes.
+    $_SESSION['file_current_upload'] = $key;
+  }
+
+  // Attach file previews to node object.
+  if (is_array($_SESSION['file_previews']) && count($_SESSION['file_previews'])) {
+    foreach($_SESSION['file_previews'] as $fid => $file) {
+      if ($user->uid != 1) {
+        // Here something.php.pps becomes something.php_.pps
+        $file->filename = upload_munge_filename($file->filename, NULL, 0);
+        $file->description = $file->filename;
+      }
+      $node->files[$fid] = $file;
+    }
+  }
+}
+
+function upload_form_alter($form_id, &$form) {
+  if (isset($form['type'])) {
+    if ($form['type']['#value'] .'_node_settings' == $form_id) {
+      $form['workflow']['upload_'. $form['type']['#value']] = array(
+        '#type' => 'radios', '#title' => t('Attachments'), '#default_value' => variable_get('upload_'. $form['type']['#value'], 1),
+        '#options' => array(t('Disabled'), t('Enabled')),
+      );
+    }
+
+    $node = $form['#node'];
+    if ($form['type']['#value'] .'_node_form' == $form_id && variable_get("upload_$node->type", TRUE) && user_access('upload files')) {
+      drupal_add_js('misc/progress.js');
+      drupal_add_js('misc/upload.js');
+
+      // Attachments fieldset
+      $form['attachments'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('File attachments'),
+        '#collapsible' => TRUE,
+        '#collapsed' => empty($node->files),
+        '#description' => t('Changes made to the attachments are not permanent until you save this post. The first "listed" file will be included in RSS feeds.'),
+        '#prefix' => '
                          ',
+        '#suffix' => '
                          ',
+        '#weight' => 30,
+      );
+
+      // Wrapper for fieldset contents (used by upload JS).
+      $form['attachments']['wrapper'] = array(
+        '#prefix' => '
                          ',
+        '#suffix' => '
                          ',
+      );
+      $form['attachments']['wrapper'] += _upload_form($node);
+      $form['#attributes']['enctype'] = 'multipart/form-data';
+    }
+  }
+}
+
+function _upload_validate(&$node) {
+  // Accumulator for disk space quotas.
+  $filesize = 0;
+
+  // Check if node->files exists, and if it contains something.
+  if (is_array($node->files)) {
+    // Update existing files with form data.
+    foreach($node->files as $fid => $file) {
+      // Convert file to object for compatibility
+      $file = (object)$file;
+
+      // Validate new uploads.
+      if (strpos($fid, 'upload') !== false && !$file->remove) {
+        global $user;
+
+        // Bypass validation for uid  = 1.
+        if ($user->uid != 1) {
+          // Update filesize accumulator.
+          $filesize += $file->filesize;
+
+          // Validate file against all users roles.
+          // Only denies an upload when all roles prevent it.
+
+          $total_usersize = upload_space_used($user->uid) + $filesize;
+          $error = array();
+          foreach ($user->roles as $rid => $name) {
+            $extensions = variable_get("upload_extensions_$rid", 'jpg jpeg gif png txt html doc xls pdf ppt pps');
+            $uploadsize = variable_get("upload_uploadsize_$rid", 1) * 1024 * 1024;
+            $usersize = variable_get("upload_usersize_$rid", 1) * 1024 * 1024;
+
+            $regex = '/\.('. ereg_replace(' +', '|', preg_quote($extensions)) .')$/i';
+
+            if (!preg_match($regex, $file->filename)) {
+              $error['extension']++;
+            }
+
+            if ($uploadsize && $file->filesize > $uploadsize) {
+              $error['uploadsize']++;
+            }
+
+            if ($usersize && $total_usersize + $file->filesize > $usersize) {
+              $error['usersize']++;
+            }
+          }
+
+          $user_roles = count($user->roles);
+          $valid = TRUE;
+          if ($error['extension'] == $user_roles) {
+            form_set_error('upload', t('The selected file %name can not be attached to this post, because it is only possible to attach files with the following extensions: %files-allowed.', array('%name' => theme('placeholder', $file->filename), '%files-allowed' => theme('placeholder', $extensions))));
+            $valid = FALSE;
+          }
+          elseif ($error['uploadsize'] == $user_roles) {
+            form_set_error('upload', t('The selected file %name can not be attached to this post, because it exceeded the maximum filesize of %maxsize.', array('%name' => theme('placeholder', $file->filename), '%maxsize' => theme('placeholder', format_size($uploadsize)))));
+            $valid = FALSE;
+          }
+          elseif ($error['usersize'] == $user_roles) {
+            form_set_error('upload', t('The selected file %name can not be attached to this post, because the disk quota of %quota has been reached.', array('%name' => theme('placeholder', $file->filename), '%quota' => theme('placeholder', format_size($usersize)))));
+            $valid = FALSE;
+          }
+          elseif (strlen($file->filename) > 255) {
+            form_set_error('upload', t('The selected file %name can not be attached to this post, because the filename is too long.', array('%name' => theme('placeholder', $file->filename))));
+            $valid = FALSE;
+          }
+
+          if (!$valid) {
+            unset($node->files[$fid], $_SESSION['file_previews'][$fid]);
+            file_delete($file->filepath);
+          }
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ */
+function upload_nodeapi(&$node, $op, $teaser) {
+  switch ($op) {
+
+    case 'load':
+      $output = '';
+      if (variable_get("upload_$node->type", 1) == 1) {
+        $output['files'] = upload_load($node);
+        return $output;
+      }
+      break;
+
+    case 'prepare':
+      _upload_prepare($node);
+      break;
+
+    case 'validate':
+      _upload_validate($node);
+      break;
+
+    case 'view':
+      if (isset($node->files) && user_access('view uploaded files')) {
+        // Manipulate so that inline references work in preview
+        if (!variable_get('clean_url', 0)) {
+          $previews = array();
+          foreach ($node->files as $file) {
+            if (strpos($file->fid, 'upload') !== false) {
+              $previews[] = $file;
+            }
+          }
+
+          // URLs to files being previewed are actually Drupal paths. When Clean
+          // URLs are disabled, the two do not match. We perform an automatic
+          // replacement from temporary to permanent URLs. That way, the author
+          // can use the final URL in the body before having actually saved (to
+          // place inline images for example).
+          foreach ($previews as $file) {
+            $old = file_create_filename($file->filename, file_create_path());
+            $new = url($old);
+            $node->body = str_replace($old, $new, $node->body);
+            $node->teaser = str_replace($old, $new, $node->teaser);
+          }
+        }
+
+        // Add the attachments list to node body
+        if (count($node->files) && !$teaser) {
+          $node->body .= theme('upload_attachments', $node->files);
+        }
+      }
+      break;
+
+    case 'insert':
+    case 'update':
+      if (user_access('upload files')) {
+        upload_save($node);
+      }
+      break;
+
+    case 'delete':
+      upload_delete($node);
+      break;
+
+    case 'delete revision':
+      upload_delete_revision($node);
+      break;
+
+    case 'search result':
+      return is_array($node->files) ? format_plural(count($node->files), '1 attachment', '%count attachments') : null;
+
+    case 'rss item':
+      if (is_array($node->files)) {
+        $files = array();
+        foreach ($node->files as $file) {
+          if ($file->list) {
+            $files[] = $file;
+          }
+        }
+        if (count($files) > 0) {
+          // RSS only allows one enclosure per item
+          $file = array_shift($files);
+          return array(
+            array(
+              'key' => 'enclosure',
+              'attributes' => array(
+                'url' => file_create_url($file->filepath),
+                'length' => $file->filesize,
+                'type' => $file->filemime
+              )
+            )
+          );
+        }
+      }
+      return array();
+  }
+}
+
+/**
+ * Displays file attachments in table
+ */
+function theme_upload_attachments($files) {
+  $header = array(t('Attachment'), t('Size'));
+  $rows = array();
+  foreach ($files as $file) {
+    if ($file->list) {
+      $href = check_url(($file->fid ? file_create_url($file->filepath) : url(file_create_filename($file->filename, file_create_path()))));
+      $text = check_plain($file->description ? $file->description : $file->filename);
+      $rows[] = array(l($text, $href), format_size($file->filesize));
+    }
+  }
+  if (count($rows)) {
+    return theme('table', $header, $rows, array('id' => 'attachments'));
+  }
+}
+
+/**
+ * Determine how much disk space is occupied by a user's uploaded files.
+ *
+ * @param $uid
+ *   The integer user id of a user.
+ * @return
+ *   The amount of disk space used by the user in bytes.
+ */
+function upload_space_used($uid) {
+  return db_result(db_query('SELECT SUM(filesize) FROM {files} f INNER JOIN {node} n ON f.nid = n.nid WHERE n.uid = %d', $uid));
+}
+
+/**
+ * Determine how much disk space is occupied by uploaded files.
+ *
+ * @return
+ *   The amount of disk space used by uploaded files in bytes.
+ */
+function upload_total_space_used() {
+  return db_result(db_query('SELECT SUM(filesize) FROM {files}'));
+}
+
+/**
+ * Munge the filename as needed for security purposes.
+ *
+ * @param $filename
+ *   The name of a file to modify.
+ * @param $extensions
+ *   A space separated list of valid extensions. If this is blank, we'll use
+ *   the admin-defined defaults for the user role from upload_extensions_$rid.
+ * @param $alerts
+ *   Whether alerts (watchdog, drupal_set_message()) should be displayed.
+ * @return $filename
+ *   The potentially modified $filename.
+ */
+function upload_munge_filename($filename, $extensions = NULL, $alerts = 1) {
+  global $user;
+
+  $original = $filename;
+
+  // Allow potentially insecure uploads for very savvy users and admin
+  if (!variable_get('allow_insecure_uploads', 0)) {
+
+    if (!isset($extensions)) {
+      $extensions = '';
+      foreach ($user->roles as $rid => $name) {
+        $extensions .= ' '. variable_get("upload_extensions_$rid", variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps'));
+      }
+
+    }
+
+    $whitelist = array_unique(explode(' ', trim($extensions)));
+
+    $filename_parts = explode('.', $filename);
+
+    $new_filename = array_shift($filename_parts); // Remove file basename.
+    $final_extension = array_pop($filename_parts); // Remove final extension.
+
+    foreach($filename_parts as $filename_part) {
+      $new_filename .= ".$filename_part";
+      if (!in_array($filename_part, $whitelist) && preg_match("/^[a-zA-Z]{2,5}\d?$/", $filename_part)) {
+        $new_filename .= '_';
+      }
+    }
+    $filename = "$new_filename.$final_extension";
+  }
+
+  if ($alerts && $original != $filename) {
+    $message = t('Your filename has been renamed to conform to site policy.');
+    drupal_set_message($message);
+  }
+
+  return $filename;
+}
+
+/**
+ * Undo the effect of upload_munge_filename().
+ */
+function upload_unmunge_filename($filename) {
+  return str_replace('_.', '.', $filename);
+}
+
+function upload_save($node) {
+  if (!is_array($node->files)) {
+    return;
+  }
+
+  foreach ($node->files as $fid => $file) {
+    // Convert file to object for compatibility
+    $file = (object)$file;
+
+    // Remove file. Process removals first since no further processing
+    // will be required.
+    if ($file->remove) {
+      // Remove file previews...
+      if (strpos($file->fid, 'upload') !== false) {
+        file_delete($file->filepath);
+      }
+
+      // Remove managed files.
+      else {
+        db_query('DELETE FROM {file_revisions} WHERE fid = %d AND vid = %d', $fid, $node->vid);
+        // Only delete a file if it isn't used by any revision
+        $count = db_result(db_query('SELECT COUNT(fid) FROM {file_revisions} WHERE fid = %d', $fid));
+        if ($count < 1) {
+          db_query('DELETE FROM {files} WHERE fid = %d', $fid);
+          file_delete($file->filepath);
+        }
+      }
+    }
+
+    // New file upload
+    elseif (strpos($file->fid, 'upload') !== false) {
+      if ($file = file_save_upload($file, $file->filename)) {
+        $file->fid = db_next_id('{files}_fid');
+        db_query("INSERT INTO {files} (fid, nid, filename, filepath, filemime, filesize) VALUES (%d, %d, '%s', '%s', '%s', %d)", $file->fid, $node->nid, $file->filename, $file->filepath, $file->filemime, $file->filesize);
+        db_query("INSERT INTO {file_revisions} (fid, vid, list, description) VALUES (%d, %d, %d, '%s')", $file->fid, $node->vid, $file->list, $file->description);
+      }
+      unset($_SESSION['file_previews'][$fid]);
+    }
+
+    // Create a new revision, as needed
+    elseif ($node->old_vid && is_numeric($fid)) {
+      db_query("INSERT INTO {file_revisions} (fid, vid, list, description) VALUES (%d, %d, %d, '%s')", $file->fid, $node->vid, $file->list, $file->description);
+    }
+
+    // Update existing revision
+    else {
+      db_query("UPDATE {file_revisions} SET list = %d, description = '%s' WHERE fid = %d AND vid = %d", $file->list, $file->description, $file->fid, $node->vid);
+    }
+  }
+}
+
+function upload_delete($node) {
+  $files = array();
+  $result = db_query('SELECT * FROM {files} WHERE nid = %d', $node->nid);
+  while ($file = db_fetch_object($result)) {
+    $files[$file->fid] = $file;
+  }
+
+  foreach ($files as $fid => $file) {
+    // Delete all file revision information associated with the node
+    db_query('DELETE FROM {file_revisions} WHERE fid = %d', $fid);
+    file_delete($file->filepath);
+  }
+
+  // Delete all files associated with the node
+  db_query('DELETE FROM {files} WHERE nid = %d', $node->nid);
+}
+
+function upload_delete_revision($node) {
+  if (is_array($node->files)) {
+    foreach ($node->files as $file) {
+      // Check if the file will be used after this revision is deleted
+      $count = db_result(db_query('SELECT COUNT(fid) FROM {file_revisions} WHERE fid = %d', $file->fid));
+
+      // if the file won't be used, delete it
+      if ($count < 2) {
+        db_query('DELETE FROM {files} WHERE fid = %d', $file->fid);
+        file_delete($file->filepath);
+      }
+    }
+  }
+
+  // delete the revision
+  db_query('DELETE FROM {file_revisions} WHERE vid = %d', $node->vid);
+}
+
+function _upload_form($node) {
+
+  $form['#theme'] = 'upload_form_new';
+
+  if (is_array($node->files) && count($node->files)) {
+    $form['files']['#theme'] = 'upload_form_current';
+    $form['files']['#tree'] = TRUE;
+    foreach ($node->files as $key => $file) {
+      $description = file_create_url((strpos($file->fid, 'upload') === false ? $file->filepath : file_create_filename($file->filename, file_create_path())));
+      $description = "". check_plain($description) ."";
+      $form['files'][$key]['description'] = array('#type' => 'textfield', '#default_value' => (strlen($file->description)) ? $file->description : $file->filename, '#maxlength' => 256, '#description' => $description );
+
+      $form['files'][$key]['size'] = array('#type' => 'markup', '#value' => format_size($file->filesize));
+      $form['files'][$key]['remove'] = array('#type' => 'checkbox', '#default_value' => $file->remove);
+      $form['files'][$key]['list'] = array('#type' => 'checkbox',  '#default_value' => $file->list);
+      // if the file was uploaded this page request, set value. this fixes the problem
+      // formapi has recognizing new checkboxes. see comments in _upload_prepare.
+      if ($_SESSION['file_current_upload'] == $file->fid) {
+        $form['files'][$key]['list']['#value'] = variable_get('upload_list_default',1);
+      }
+      $form['files'][$key]['filename'] = array('#type' => 'value',  '#value' => $file->filename);
+      $form['files'][$key]['filepath'] = array('#type' => 'value',  '#value' => $file->filepath);
+      $form['files'][$key]['filemime'] = array('#type' => 'value',  '#value' => $file->filemime);
+      $form['files'][$key]['filesize'] = array('#type' => 'value',  '#value' => $file->filesize);
+      $form['files'][$key]['fid'] = array('#type' => 'value',  '#value' => $file->fid);
+    }
+  }
+
+  if (user_access('upload files')) {
+    // This div is hidden when the user uploads through JS.
+    $form['new'] = array(
+      '#prefix' => '
                          ',
+      '#suffix' => '
                          ',
+    );
+    $form['new']['upload'] = array('#type' => 'file', '#title' => t('Attach new file'), '#size' => 40);
+    $form['new']['attach'] = array('#type' => 'button', '#value' => t('Attach'), '#name'=> 'attach', '#attributes' => array('id' => 'attach'));
+    // The class triggers the js upload behaviour.
+    $form['attach'] = array('#type' => 'hidden', '#value' => url('upload/js', NULL, NULL, TRUE), '#attributes' => array('class' => 'upload'));
+  }
+
+  // Needed for JS
+  $form['current']['vid'] = array('#type' => 'hidden', '#value' => $node->vid);
+  return $form;
+}
+
+/**
+ * Theme the attachments list.
+ */
+function theme_upload_form_current(&$form) {
+  $header = array(t('Delete'), t('List'), t('Description'), t('Size'));
+
+  foreach (element_children($form) as $key) {
+    $row = array();
+    $row[] = form_render($form[$key]['remove']);
+    $row[] = form_render($form[$key]['list']);
+    $row[] = form_render($form[$key]['description']);
+    $row[] = form_render($form[$key]['size']);
+    $rows[] = $row;
+  }
+  $output = theme('table', $header, $rows);
+  $output .= form_render($form);
+  return $output;
+}
+
+/**
+ * Theme the attachment form.
+ * Note: required to output prefix/suffix.
+ */
+function theme_upload_form_new($form) {
+  $output = form_render($form);
+  return $output;
+}
+
+function upload_load($node) {
+  $files = array();
+
+  if ($node->vid) {
+    $result = db_query('SELECT * FROM {files} f INNER JOIN {file_revisions} r ON f.fid = r.fid WHERE r.vid = %d ORDER BY f.fid', $node->vid);
+    while ($file = db_fetch_object($result)) {
+      $files[$file->fid] = $file;
+    }
+  }
+
+  return $files;
+}
+
+/**
+ * Check an upload, if it is an image, make sure it fits within the
+ * maximum dimensions allowed.
+ */
+function _upload_image($file) {
+  $info = image_get_info($file->filepath);
+
+  if ($info) {
+    list($width, $height) = explode('x', variable_get('upload_max_resolution', 0));
+    if ($width && $height) {
+      $result = image_scale($file->filepath, $file->filepath, $width, $height);
+      if ($result) {
+        $file->filesize = filesize($file->filepath);
+        drupal_set_message(t('The image was resized to fit within the maximum allowed resolution of %resolution pixels.', array('%resolution' => theme('placeholder', variable_get('upload_max_resolution', 0)))));
+      }
+    }
+  }
+
+  return $file;
+}
+
+/**
+ * Menu-callback for JavaScript-based uploads.
+ */
+function upload_js() {
+  // We only do the upload.module part of the node validation process.
+  $node = (object)$_POST['edit'];
+
+  // Load existing node files.
+  $node->files = upload_load($node);
+
+  // Handle new uploads, and merge tmp files into node-files.
+  _upload_prepare($node);
+  _upload_validate($node);
+
+  $form = _upload_form($node);
+  foreach (module_implements('form_alter') as $module) {
+    $function = $module .'_form_alter';
+    $function('upload_js', $form);
+  }
+  $form = form_builder('upload_js', $form);
+  $output = theme('status_messages') . form_render($form);
+  // We send the updated file attachments form.
+  print drupal_to_js(array('status' => TRUE, 'data' => $output));
+  exit;
+}
diff --git a/modules/user.module b/modules/user.module
new file mode 100644
index 0000000..fe3a7a3
--- /dev/null
+++ b/modules/user.module
@@ -0,0 +1,2134 @@
+ $value) {
+    if ($key == 'uid' || $key == 'status') {
+      $query[] = "$key = %d";
+      $params[] = $value;
+    }
+    else if ($key == 'pass') {
+      $query[] = "pass = '%s'";
+      $params[] = md5($value);
+    }
+    else {
+      $query[]= "LOWER($key) = LOWER('%s')";
+      $params[] = $value;
+    }
+  }
+  $result = db_query('SELECT * FROM {users} u WHERE ' . implode(' AND ', $query), $params);
+
+  if (db_num_rows($result)) {
+    $user = db_fetch_object($result);
+    $user = drupal_unpack($user);
+
+    $user->roles = array();
+    if ($user->uid) {
+      $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
+    }
+    else {
+      $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
+    }
+    $result = db_query('SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d', $user->uid);
+    while ($role = db_fetch_object($result)) {
+      $user->roles[$role->rid] = $role->name;
+    }
+    user_module_invoke('load', $array, $user);
+  }
+  else {
+    $user = FALSE;
+  }
+
+  return $user;
+}
+
+/**
+ * Save changes to a user account or add a new user.
+ *
+ * @param $account
+ *   The $user object for the user to modify or add. If $user->uid is
+ *   omitted, a new user will be added.
+ *
+ * @param $array
+ *   An array of fields and values to save. For example array('name' => 'My name');
+ *   Setting a field to null deletes it from the data column.
+ *
+ * @param $category
+ *   (optional) The category for storing profile information in.
+ */
+function user_save($account, $array = array(), $category = 'account') {
+  // Dynamically compose a SQL query:
+  $user_fields = user_fields();
+  if ($account->uid) {
+    user_module_invoke('update', $array, $account, $category);
+
+    $data = unserialize(db_result(db_query('SELECT data FROM {users} WHERE uid = %d', $account->uid)));
+    foreach ($array as $key => $value) {
+      if ($key == 'pass' && !empty($value)) {
+        $query .= "$key = '%s', ";
+        $v[] = md5($value);
+      }
+      else if ((substr($key, 0, 4) !== 'auth') && ($key != 'pass')) {
+        if (in_array($key, $user_fields)) {
+          // Save standard fields
+          $query .= "$key = '%s', ";
+          $v[] = $value;
+        }
+        else if ($key != 'roles') {
+          // Roles is a special case: it used below.
+          if ($value === null) {
+            unset($data[$key]);
+          }
+          else {
+            $data[$key] = $value;
+          }
+        }
+      }
+    }
+    $query .= "data = '%s' ";
+    $v[] = serialize($data);
+
+    db_query("UPDATE {users} SET $query WHERE uid = %d", array_merge($v, array($account->uid)));
+
+    // Reload user roles if provided
+    if (is_array($array['roles'])) {
+      db_query('DELETE FROM {users_roles} WHERE uid = %d', $account->uid);
+
+      foreach (array_keys($array['roles']) as $rid) {
+        if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
+          db_query('INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)', $account->uid, $rid);
+        }
+      }
+    }
+
+    // Delete a blocked user's sessions to kick them if they are online.
+    if (isset($array['status']) && $array['status'] == 0) {
+      db_query('DELETE FROM {sessions} WHERE uid = %d', $account->uid);
+    }
+
+    // Refresh user object
+    $user = user_load(array('uid' => $account->uid));
+  }
+  else {
+    $array['created'] = time();
+    $array['uid'] = db_next_id('{users}_uid');
+
+    // Note, we wait with saving the data column to prevent module-handled
+    // fields from being saved there. We cannot invoke hook_user('insert') here
+    // because we don't have a fully initialized user object yet.
+    foreach ($array as $key => $value) {
+      switch($key) {
+        case 'pass':
+          $fields[] = $key;
+          $values[] = md5($value);
+          $s[] = "'%s'";
+          break;
+        case 'uid':        case 'mode':     case 'sort':
+        case 'threshold':  case 'created':  case 'access':
+        case 'login':      case 'status':
+          $fields[] = $key;
+          $values[] = $value;
+          $s[] = "%d";
+          break;
+        default:
+          if (substr($key, 0, 4) !== 'auth' && in_array($key, $user_fields)) {
+            $fields[] = $key;
+            $values[] = $value;
+            $s[] = "'%s'";
+          }
+          break;
+      }
+    }
+    db_query('INSERT INTO {users} ('. implode(', ', $fields) .') VALUES ('. implode(', ', $s) .')', $values);
+
+    // Reload user roles (delete just to be safe).
+    db_query('DELETE FROM {users_roles} WHERE uid = %d', $array['uid']);
+    foreach ((array)$array['roles'] as $rid) {
+      if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
+        db_query('INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)', $array['uid'], $rid);
+      }
+    }
+
+    // Build the initial user object.
+    $user = user_load(array('uid' => $array['uid']));
+
+    user_module_invoke('insert', $array, $user, $category);
+
+    // Build and save the serialized data field now
+    $data = array();
+    foreach ($array as $key => $value) {
+      if ((substr($key, 0, 4) !== 'auth') && ($key != 'roles') && (!in_array($key, $user_fields)) && ($value !== null)) {
+        $data[$key] = $value;
+      }
+    }
+    db_query("UPDATE {users} SET data = '%s' WHERE uid = %d", serialize($data), $user->uid);
+
+    // Build the finished user object.
+    $user = user_load(array('uid' => $array['uid']));
+  }
+
+  // Save distributed authentication mappings
+  $authmaps = array();
+  foreach ($array as $key => $value) {
+    if (substr($key, 0, 4) == 'auth') {
+      $authmaps[$key] = $value;
+    }
+  }
+  if (sizeof($authmaps) > 0) {
+    user_set_authmaps($user, $authmaps);
+  }
+
+  return $user;
+}
+
+/**
+ * Verify the syntax of the given name.
+ */
+function user_validate_name($name) {
+  if (!strlen($name)) return t('You must enter a username.');
+  if (substr($name, 0, 1) == ' ') return t('The username cannot begin with a space.');
+  if (substr($name, -1) == ' ') return t('The username cannot end with a space.');
+  if (ereg('  ', $name)) return t('The username cannot contain multiple spaces in a row.');
+  if (ereg("[^\x80-\xF7 [:alnum:]@_.-]", $name)) return t('The username contains an illegal character.');
+  if (preg_match('/[\x{80}-\x{A0}'.          // Non-printable ISO-8859-1 + NBSP
+                   '\x{AD}'.                 // Soft-hyphen
+                   '\x{2000}-\x{200F}'.      // Various space characters
+                   '\x{2028}-\x{202F}'.      // Bidirectional text overrides
+                   '\x{205F}-\x{206F}'.      // Various text hinting characters
+                   '\x{FEFF}'.               // Byte order mark
+                   '\x{FF01}-\x{FF60}'.      // Full-width latin
+                   '\x{FFF9}-\x{FFFD}]/u',   // Replacement characters
+                   $name)) {
+    return t('The username contains an illegal character.');
+  }
+  if (ereg('@', $name) && !eregi('@([0-9a-z](-?[0-9a-z])*.)+[a-z]{2}([zmuvtg]|fo|me)?$', $name)) return t('The username is not a valid authentication ID.');
+  if (strlen($name) > 56) return t('The username %name is too long: it must be less than 56 characters.', array('%name' => theme('placeholder', $name)));
+}
+
+function user_validate_mail($mail) {
+  if (!$mail) return t('You must enter an e-mail address.');
+  if (!valid_email_address($mail)) {
+    return t('The e-mail address %mail is not valid.', array('%mail' => theme('placeholder', $mail)));
+  }
+}
+
+function user_validate_picture($file, &$edit, $user) {
+  global $form_values;
+  // Initialize the picture:
+  $form_values['picture'] = $user->picture;
+
+  // Check that uploaded file is an image, with a maximum file size
+  // and maximum height/width.
+  $info = image_get_info($file->filepath);
+  list($maxwidth, $maxheight) = explode('x', variable_get('user_picture_dimensions', '85x85'));
+
+  if (!$info || !$info['extension']) {
+    form_set_error('picture_upload', t('The uploaded file was not an image.'));
+  }
+  else if (image_get_toolkit()) {
+    image_scale($file->filepath, $file->filepath, $maxwidth, $maxheight);
+  }
+  else if (filesize($file->filepath) > (variable_get('user_picture_file_size', '30') * 1000)) {
+    form_set_error('picture_upload', t('The uploaded image is too large; the maximum file size is %size kB.', array('%size' => variable_get('user_picture_file_size', '30'))));
+  }
+  else if ($info['width'] > $maxwidth || $info['height'] > $maxheight) {
+    form_set_error('picture_upload', t('The uploaded image is too large; the maximum dimensions are %dimensions pixels.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'))));
+  }
+
+  if (!form_get_errors()) {
+    if ($file = file_save_upload('picture_upload', variable_get('user_picture_path', 'pictures') .'/picture-'. $user->uid . '.' . $info['extension'], 1)) {
+      $form_values['picture'] = $file->filepath;
+    }
+    else {
+      form_set_error('picture_upload', t("Failed to upload the picture image; the %directory directory doesn't exist.", array('%directory' => ''. variable_get('user_picture_path', 'pictures') .'')));
+    }
+  }
+}
+
+/**
+ * Generate a random alphanumeric password.
+ */
+function user_password($length = 10) {
+  // This variable contains the list of allowable characters for the
+  // password.  Note that the number 0 and the letter 'O' have been
+  // removed to avoid confusion between the two.  The same is true
+  // of 'I', 1, and l.
+  $allowable_characters = 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789';
+
+  // Zero-based count of characters in the allowable list:
+  $len = strlen($allowable_characters) - 1;
+
+  // Declare the password as a blank string.
+  $pass = '';
+
+  // Loop the number of times specified by $length.
+  for ($i = 0; $i < $length; $i++) {
+
+    // Each iteration, pick a random character from the
+    // allowable string and append it to the password:
+    $pass .= $allowable_characters[mt_rand(0, $len)];
+  }
+
+  return $pass;
+}
+
+/**
+ * Determine whether the user has a given privilege.
+ *
+ * @param $string
+ *   The permission, such as "administer nodes", being checked for.
+ * @param $account
+ *   (optional) The account to check, if not given use currently logged in user.
+ *
+ * @return
+ *   boolean TRUE if the current user has the requested permission.
+ *
+ * All permission checks in Drupal should go through this function. This
+ * way, we guarantee consistent behavior, and ensure that the superuser
+ * can perform all actions.
+ */
+function user_access($string, $account = NULL) {
+  global $user;
+  static $perm = array();
+
+  if (is_null($account)) {
+    $account = $user;
+  }
+
+  // User #1 has all privileges:
+  if ($account->uid == 1) {
+    return TRUE;
+  }
+
+  // To reduce the number of SQL queries, we cache the user's permissions
+  // in a static variable.
+  if (!isset($perm[$account->uid])) {
+    $result = db_query("SELECT DISTINCT(p.perm) FROM {role} r INNER JOIN {permission} p ON p.rid = r.rid WHERE r.rid IN (%s)", implode(',', array_keys($account->roles)));
+
+    $perm[$account->uid] = '';
+    while ($row = db_fetch_object($result)) {
+      $perm[$account->uid] .= "$row->perm, ";
+    }
+  }
+
+  if (isset($perm[$account->uid])) {
+    return strpos($perm[$account->uid], "$string, ") !== FALSE;
+  }
+
+  return FALSE;
+}
+
+/**
+ * Checks for usernames blocked by user administration
+ *
+ * @return boolean true for blocked users, false for active
+ */
+function user_is_blocked($name) {
+  $allow = db_fetch_object(db_query("SELECT * FROM {users} WHERE status = 1 AND name = LOWER('%s')", $name));
+  $deny  = db_fetch_object(db_query("SELECT * FROM {users} WHERE status = 0 AND name = LOWER('%s')", $name));
+
+  return $deny && !$allow;
+}
+
+/**
+ * Send an e-mail message, using Drupal variables and default settings.
+ * More information in the PHP function reference for mail()
+ * @param $mail
+ *  The mail adres or addresses where the message will be send to. The
+ *  formatting of this string must comply with RFC 2822. Some examples are:
+ *    user@example.com
+ *    user@example.com, anotheruser@example.com
+ *    User 
+ *    User , Another User 
+ *  @param $subject
+ *    Subject of the email to be sent. This must not contain any newline characters, or the mail may not be sent properly.
+ *  @param $message
+ *    Message to be sent. Drupal will format the correct line endings for you.
+ *  @param $header
+ *    String to be inserted at the end of the email header. This is typically
+ *    used to add extra headers (From, Cc, and Bcc). Multiple extra headers
+ *    should be separated with a CRLF (\r\n).
+ *    When sending mail, the mail must contain a From header.
+ * @return Returns TRUE if the mail was successfully accepted for delivery, FALSE otherwise.
+ */
+function user_mail($mail, $subject, $message, $header) {
+  if (variable_get('smtp_library', '') && file_exists(variable_get('smtp_library', ''))) {
+   include_once './' . variable_get('smtp_library', '');
+    return user_mail_wrapper($mail, $subject, $message, $header);
+  }
+  else {
+    /*
+    ** Note: if you are having problems with sending mail, or mails look wrong
+    ** when they are received you may have to modify the str_replace to suit
+    ** your systems.
+    **  - \r\n will work under dos and windows.
+    **  - \n will work for linux, unix and BSDs.
+    **  - \r will work for macs.
+    **
+    ** According to RFC 2646, it's quite rude to not wrap your e-mails:
+    **
+    ** "The Text/Plain media type is the lowest common denominator of
+    ** Internet e-mail, with lines of no more than 997 characters (by
+    ** convention usually no more than 80), and where the CRLF sequence
+    ** represents a line break [MIME-IMT]."
+    **
+    ** CRLF === \r\n
+    **
+    ** http://www.rfc-editor.org/rfc/rfc2646.txt
+    **
+    */
+    return mail(
+      $mail,
+      mime_header_encode($subject),
+      str_replace("\r", '', $message),
+      "MIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8; format=flowed\nContent-transfer-encoding: 8Bit\n" . $header
+    );
+  }
+}
+
+function user_fields() {
+  static $fields;
+
+  if (!$fields) {
+    $result = db_query('SELECT * FROM {users} WHERE uid = 1');
+    if (db_num_rows($result)) {
+      $fields = array_keys(db_fetch_array($result));
+    }
+    else {
+      // Make sure we return the default fields at least
+      $fields = array('uid', 'name', 'pass', 'mail', 'picture', 'mode', 'sort', 'threshold', 'theme', 'signature', 'created', 'access', 'login', 'status', 'timezone', 'language', 'init', 'data');
+    }
+  }
+
+  return $fields;
+}
+
+/**
+ * Implementation of hook_perm().
+ */
+function user_perm() {
+  return array('administer access control', 'administer users', 'access user profiles', 'change own username');
+}
+
+/**
+ * Implementation of hook_file_download().
+ *
+ * Ensure that user pictures (avatars) are always downloadable.
+ */
+function user_file_download($file) {
+  if (strpos($file, variable_get('user_picture_path', 'pictures') .'/picture-') === 0) {
+    $info = image_get_info(file_create_path($file));
+    return array('Content-type: '. $info['mime_type']);
+  }
+}
+
+/**
+ * Implementation of hook_search().
+ */
+function user_search($op = 'search', $keys = null) {
+  switch ($op) {
+    case 'name':
+      if (user_access('access user profiles')) {
+        return t('users');
+      }
+    case 'search':
+      if (user_access('access user profiles')) {
+        $find = array();
+        // Replace wildcards with MySQL/PostgreSQL wildcards.
+        $keys = preg_replace('!\*+!', '%', $keys);
+        $result = pager_query("SELECT * FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys);
+        while ($account = db_fetch_object($result)) {
+          $find[] = array('title' => $account->name, 'link' => url('user/'. $account->uid));
+        }
+        return $find;
+      }
+  }
+}
+
+/**
+ * Implementation of hook_user().
+ */
+function user_user($type, &$edit, &$user, $category = NULL) {
+  if ($type == 'view') {
+    $items[] = array('title' => t('Member for'),
+      'value' => format_interval(time() - $user->created),
+      'class' => 'member',
+    );
+
+    return array(t('History') => $items);
+  }
+  if ($type == 'form' && $category == 'account') {
+    return user_edit_form(arg(1), $edit);
+  }
+
+  if ($type == 'validate' && $category == 'account') {
+    return _user_edit_validate(arg(1), $edit);
+  }
+
+  if ($type == 'submit' && $category == 'account') {
+    return _user_edit_submit(arg(1), $edit);
+  }
+
+  if ($type == 'categories') {
+    return array(array('name' => 'account', 'title' => t('account settings'), 'weight' => 1));
+  }
+}
+
+/**
+ * Implementation of hook_block().
+ */
+function user_block($op = 'list', $delta = 0, $edit = array()) {
+  global $user;
+
+  if ($op == 'list') {
+     $blocks[0]['info'] = t('User login');
+     $blocks[1]['info'] = t('Navigation');
+     $blocks[2]['info'] = t('Who\'s new');
+     $blocks[3]['info'] = t('Who\'s online');
+
+     return $blocks;
+  }
+  else if ($op == 'configure' && $delta == 3) {
+    $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval');
+    $form['user_block_seconds_online'] = array('#type' => 'select', '#title' => t('User activity'), '#default_value' => variable_get('user_block_seconds_online', 900), '#options' => $period, '#description' => t('A user is considered online for this long after they have last viewed a page.'));
+    $form['user_block_max_list_count'] = array('#type' => 'select', '#title' => t('User list length'), '#default_value' => variable_get('user_block_max_list_count', 10), '#options' => drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), '#description' => t('Maximum number of currently online users to display.'));
+
+    return $form;
+  }
+  else if ($op == 'save' && $delta == 3) {
+    variable_set('user_block_seconds_online', $edit['user_block_seconds_online']);
+    variable_set('user_block_max_list_count', $edit['user_block_max_list_count']);
+  }
+  else if ($op == 'view') {
+    $block = array();
+
+    switch ($delta) {
+      case 0:
+        // For usability's sake, avoid showing two login forms on one page.
+        if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
+          // Unset the time, if any. This prevents a 404 if a user relogs in
+          // on the page they were sent to when they logged out. See
+          // user_login_submit() for explanation of the time parameter.
+          unset($_GET['time']);
+          $form['#action'] = url($_GET['q'], drupal_get_destination());
+          $form['#id'] = 'user-login-form';
+          $form['name'] = array('#type' => 'textfield',
+            '#title' => t('Username'),
+            '#maxlength' => 60,
+            '#size' => 15,
+            '#required' => TRUE,
+          );
+          $form['pass'] = array('#type' => 'password',
+            '#title' => t('Password'),
+            '#size' => 15,
+            '#required' => TRUE,
+          );
+          $form['submit'] = array('#type' => 'submit',
+            '#value' => t('Log in'),
+          );
+
+          if (variable_get('user_register', 1)) {
+            $items[] = l(t('Create new account'), 'user/register', array('title' => t('Create a new user account.')));
+          }
+          $items[] = l(t('Request new password'), 'user/password', array('title' => t('Request new password via e-mail.')));
+          $form['links'] = array('#value' => theme('item_list', $items));
+
+          $block['subject'] = t('User login');
+          $block['content'] = drupal_get_form('user_login_block', $form, 'user_login');
+        }
+        return $block;
+
+      case 1:
+        if ($menu = theme('menu_tree')) {
+           $block['subject'] = $user->uid ? $user->name : t('Navigation');
+           $block['content'] = $menu;
+        }
+        return $block;
+
+      case 2:
+        if (user_access('access content')) {
+          // Retrieve a list of new users who have subsequently accessed the site successfully.
+          $result = db_query_range('SELECT uid, name FROM {users} WHERE status != 0 AND access != 0 ORDER BY created DESC', 0, 5);
+          while ($account = db_fetch_object($result)) {
+            $items[] = $account;
+          }
+          $output = theme('user_list', $items);
+
+          $block['subject'] = t('Who\'s new');
+          $block['content'] = $output;
+        }
+        return $block;
+
+      case 3:
+        if (user_access('access content')) {
+          // Count users with activity in the past defined period.
+          $time_period = variable_get('user_block_seconds_online', 900);
+
+          // Perform database queries to gather online user lists.
+          $guests = db_fetch_object(db_query('SELECT COUNT(sid) AS count FROM {sessions} WHERE timestamp >= %d AND uid = 0', time() - $time_period));
+          $users = db_query('SELECT uid, name, access FROM {users} WHERE access >= %d AND uid != 0 ORDER BY access DESC', time() - $time_period);
+          $total_users = db_num_rows($users);
+
+          // Format the output with proper grammar.
+          if ($total_users == 1 && $guests->count == 1) {
+            $output = t('There is currently %members and %visitors online.', array('%members' => format_plural($total_users, '1 user', '%count users'), '%visitors' => format_plural($guests->count, '1 guest', '%count guests')));
+          }
+          else {
+            $output = t('There are currently %members and %visitors online.', array('%members' => format_plural($total_users, '1 user', '%count users'), '%visitors' => format_plural($guests->count, '1 guest', '%count guests')));
+          }
+
+          // Display a list of currently online users.
+          $max_users = variable_get('user_block_max_list_count', 10);
+          if ($total_users && $max_users) {
+            $items = array();
+
+            while ($max_users-- && $account = db_fetch_object($users)) {
+              $items[] = $account;
+            }
+
+            $output .= theme('user_list', $items, t('Online users'));
+          }
+
+          $block['subject'] = t('Who\'s online');
+          $block['content'] = $output;
+        }
+        return $block;
+    }
+  }
+}
+
+function theme_user_picture($account) {
+  if (variable_get('user_pictures', 0)) {
+    if ($account->picture && file_exists($account->picture)) {
+      $picture = file_create_url($account->picture);
+    }
+    else if (variable_get('user_picture_default', '')) {
+      $picture = variable_get('user_picture_default', '');
+    }
+
+    if (isset($picture)) {
+      $alt = t('%user\'s picture', array('%user' => $account->name ? $account->name : variable_get('anonymous', 'Anonymous')));
+      $picture = theme('image', $picture, $alt, $alt, '', false);
+      if (!empty($account->uid) && user_access('access user profiles')) {
+        $picture = l($picture, "user/$account->uid", array('title' => t('View user profile.')), NULL, NULL, FALSE, TRUE);
+      }
+
+      return "
                          $picture
                          ";
+    }
+  }
+}
+
+/**
+ * Theme a user page
+ * @param $account the user object
+ * @param $fields a multidimensional array for the fields, in the form of array (
+ *   'category1' => array(item_array1, item_array2), 'category2' => array(item_array3,
+ *    .. etc.). Item arrays are formatted as array(array('title' => 'item title',
+ * 'value' => 'item value', 'class' => 'class-name'), ... etc.). Module names are incorporated
+ * into the CSS class.
+ *
+ * @ingroup themeable
+ */
+function theme_user_profile($account, $fields) {
+  $output = '
                          ';
+  $output .= theme('user_picture', $account);
+  foreach ($fields as $category => $items) {
+    if (strlen($category) > 0) {
+      $output .= '
                          '. $category .'
                          ';
+    }
+    $output .= '
                          ';
+    foreach ($items as $item) {
+      if (isset($item['title'])) {
+        $output .= '
                          '. $item['title'] .'
                          ';
+      }
+      $output .= '
                          '. $item['value'] .'
                          ';
+    }
+    $output .= '
                          ';
+  }
+  $output .= '
                          ';
+
+  return $output;
+}
+
+/**
+ * Make a list of users.
+ * @param $items an array with user objects. Should contain at least the name and uid
+ *
+ * @ingroup themeable
+ */
+function theme_user_list($users, $title = NULL) {
+  if (!empty($users)) {
+    foreach ($users as $user) {
+      $items[] = theme('username', $user);
+    }
+  }
+  return theme('item_list', $items, $title);
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function user_menu($may_cache) {
+  global $user;
+
+  $items = array();
+
+  $admin_access = user_access('administer users');
+  $access_access = user_access('administer access control');
+  $view_access = user_access('access user profiles');
+
+  if ($may_cache) {
+    $items[] = array('path' => 'user', 'title' => t('user account'),
+      'callback' => 'user_login', 'access' => TRUE, 'type' => MENU_CALLBACK);
+
+    $items[] = array('path' => 'user/autocomplete', 'title' => t('user autocomplete'),
+      'callback' => 'user_autocomplete', 'access' => $view_access, 'type' => MENU_CALLBACK);
+
+    // Registration and login pages.
+    $items[] = array('path' => 'user/login', 'title' => t('log in'),
+      'callback' => 'user_login', 'type' => MENU_DEFAULT_LOCAL_TASK);
+    $items[] = array('path' => 'user/register', 'title' => t('register'),
+      'callback' => 'user_register', 'access' => $user->uid == 0 && variable_get('user_register', 1), 'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'user/password', 'title' => t('request new password'),
+      'callback' => 'user_pass', 'access' => $user->uid == 0, 'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'user/reset', 'title' => t('reset password'),
+      'callback' => 'user_pass_reset', 'access' => TRUE, 'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'user/help', 'title' => t('help'),
+      'callback' => 'user_help_page', 'type' => MENU_CALLBACK);
+
+    // Admin user pages
+    $items[] = array('path' => 'admin/user', 'title' => t('users'),
+      'callback' => 'user_admin', 'access' => $admin_access);
+    $items[] = array('path' => 'admin/user/list', 'title' => t('list'),
+      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
+    $items[] = array('path' => 'admin/user/create', 'title' => t('add user'),
+      'callback' => 'user_admin', 'access' => $admin_access,
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/settings/user', 'title' => t('users'),
+      'callback' => 'user_configure');
+
+    // Admin access pages
+    $items[] = array('path' => 'admin/access', 'title' => t('access control'),
+      'callback' => 'user_admin_perm', 'access' => $access_access);
+    $items[] = array('path' => 'admin/access/permissions', 'title' => t('permissions'),
+      'callback' => 'user_admin_perm', 'access' => $access_access,
+      'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
+    $items[] = array('path' => 'admin/access/roles', 'title' => t('roles'),
+      'callback' => 'user_admin_role', 'access' => $access_access,
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/access/roles/edit', 'title' => t('edit role'),
+      'callback' => 'user_admin_role', 'access' => $access_access,
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/access/rules', 'title' => t('access rules'),
+      'callback' => 'user_admin_access', 'access' => $access_access,
+      'type' => MENU_LOCAL_TASK, 'weight' => 10);
+    $items[] = array('path' => 'admin/access/rules/list', 'title' => t('list'),
+      'access' => $access_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
+    $items[] = array('path' => 'admin/access/rules/add', 'title' => t('add rule'),
+      'callback' => 'user_admin_access_add', 'access' => $access_access,
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/access/rules/check', 'title' => t('check rules'),
+      'callback' => 'user_admin_access_check', 'access' => $access_access,
+      'type' => MENU_LOCAL_TASK);
+    $items[] = array('path' => 'admin/access/rules/edit', 'title' => t('edit rule'),
+      'callback' => 'user_admin_access_edit', 'access' => $access_access,
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'admin/access/rules/delete', 'title' => t('delete rule'),
+      'callback' => 'user_admin_access_delete', 'access' => $access_access,
+      'type' => MENU_CALLBACK);
+
+    if (module_exist('search')) {
+      $items[] = array('path' => 'admin/user/search', 'title' => t('search'),
+        'callback' => 'user_admin', 'access' => $admin_access,
+        'type' => MENU_LOCAL_TASK);
+    }
+
+    // Your personal page
+    if ($user->uid) {
+      $items[] = array('path' => 'user/'. $user->uid, 'title' => t('my account'),
+        'callback' => 'user_view', 'callback arguments' => array(arg(1)), 'access' => TRUE,
+        'type' => MENU_DYNAMIC_ITEM);
+    }
+
+    $items[] = array('path' => 'logout', 'title' => t('log out'),
+      'access' => $user->uid != 0,
+      'callback' => 'user_logout',
+      'weight' => 10);
+  }
+  else {
+    if (arg(0) == 'user' && is_numeric(arg(1)) && arg(1) > 0) {
+      $account = user_load(array('uid' => arg(1)));
+
+      if ($user !== FALSE) {
+        // Always let a user view their own account
+        $view_access |= $user->uid == arg(1);
+        // Only admins can view blocked accounts
+        $view_access &= $account->status || $admin_access;
+
+        $items[] = array('path' => 'user/'. arg(1), 'title' => t('user'),
+          'type' => MENU_CALLBACK, 'callback' => 'user_view',
+          'callback arguments' => array(arg(1)), 'access' => $view_access);
+
+        $items[] = array('path' => 'user/'. arg(1) .'/view', 'title' => t('view'),
+          'access' => $view_access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
+
+        $items[] = array('path' => 'user/'. arg(1) .'/edit', 'title' => t('edit'),
+          'callback' => 'user_edit', 'access' => $admin_access || $user->uid == arg(1),
+          'type' => MENU_LOCAL_TASK);
+        $items[] = array('path' => 'user/'. arg(1) .'/delete', 'title' => t('delete'),
+          'callback' => 'user_edit', 'access' => $admin_access,
+          'type' => MENU_CALLBACK);
+
+        if (arg(2) == 'edit') {
+          if (($categories = _user_categories($account)) && (count($categories) > 1)) {
+            foreach ($categories as $key => $category) {
+              $items[] = array(
+                'path' => 'user/'. arg(1) .'/edit/'. $category['name'],
+                'title' => $category['title'],
+                'type' => $category['name'] == 'account' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
+                'weight' => $category['weight'],
+                'access' => ($admin_access || $user->uid == arg(1)));
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return $items;
+}
+
+/**
+ * Accepts an user object, $account, or a DA name and returns an associative
+ * array of modules and DA names. Called at external login.
+ */
+function user_get_authmaps($authname = NULL) {
+  $result = db_query("SELECT authname, module FROM {authmap} WHERE authname = '%s'", $authname);
+  if (db_num_rows($result) > 0) {
+    while ($authmap = db_fetch_object($result)) {
+      $authmaps[$authmap->module] = $authmap->authname;
+    }
+    return $authmaps;
+  }
+  else {
+    return 0;
+  }
+}
+
+function user_set_authmaps($account, $authmaps) {
+  foreach ($authmaps as $key => $value) {
+    $module = explode('_', $key, 2);
+    if ($value) {
+      db_query("UPDATE {authmap} SET authname = '%s' WHERE uid = %d AND module = '%s'", $value, $account->uid, $module['1']);
+      if (!db_affected_rows()) {
+        db_query("INSERT INTO {authmap} (authname, uid, module) VALUES ('%s', %d, '%s')", $value, $account->uid, $module[1]);
+      }
+    }
+    else {
+      db_query("DELETE FROM {authmap} WHERE uid = %d AND module = '%s'", $account->uid, $module['1']);
+    }
+  }
+}
+
+function user_auth_help_links() {
+  $links = array();
+  foreach (module_list() as $module) {
+    if (module_hook($module, 'auth')) {
+      $links[] = l(module_invoke($module, 'info', 'name'), "user/help#$module");
+    }
+  }
+  return $links;
+}
+
+/*** User features *********************************************************/
+
+
+
+function user_login($msg = '') {
+  global $user, $base_url;
+
+  // If we are already logged on, go to the user
+  // page instead. The added time prevents caching.
+  if ($user->uid) {
+    drupal_goto('user/'. $user->uid, 'time='. time());
+  }
+
+  // Display login form:
+  if ($msg) {
+    $form['message'] = array('#value' => '
                          '. check_plain($msg) .'
                          ');
+  }
+  unset($_GET['time']);
+  $form['#action'] = url($_GET['q'], drupal_get_destination());
+  $form['name'] = array('#type' => 'textfield',
+    '#title' => t('Username'),
+    '#size' => 30,
+    '#maxlength' => 60,
+    '#required' => TRUE,
+    '#attributes' => array('tabindex' => '1'),
+  );
+  if (variable_get('drupal_authentication_service', FALSE) && count(user_auth_help_links()) > 0) {
+    $form['name']['#description'] = t('Enter your %s username, or an ID from one of our affiliates: %a.', array('%s' => variable_get('site_name', 'local'), '%a' => implode(', ', user_auth_help_links())));
+  }
+  else {
+    $form['name']['#description'] = t('Enter your %s username.', array('%s' => variable_get('site_name', 'local')));
+  }
+  $form['pass'] = array('#type' => 'password',
+    '#title' => t('Password'),
+    '#description' => t('Enter the password that accompanies your username.'),
+    '#required' => TRUE,
+    '#attributes' => array('tabindex' => '2'),
+  );
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'), '#weight' => 2, '#attributes' => array('tabindex' => '3'));
+  return drupal_get_form('user_login', $form);
+}
+
+function user_login_validate($form_id, $form_values) {
+  if ($form_values['name']) {
+    if (user_is_blocked($form_values['name'])) {
+      // blocked in user administration
+      form_set_error('login', t('The username %name has not been activated or is blocked.', array('%name' => theme('placeholder', $form_values['name']))));
+    }
+    else if (drupal_is_denied('user', $form_values['name'])) {
+      // denied by access controls
+      form_set_error('login', t('The name %name is a reserved username.', array('%name' => theme('placeholder', $form_values['name']))));
+    }
+    else if ($form_values['pass']) {
+      $user = user_authenticate($form_values['name'], trim($form_values['pass']));
+
+      if (!$user->uid) {
+        form_set_error('login', t('Sorry. Unrecognized username or password.') .' '. l(t('Have you forgotten your password?'), 'user/password'));
+        watchdog('user', t('Login attempt failed for %user.', array('%user' => theme('placeholder', $form_values['name']))));
+      }
+    }
+  }
+}
+
+function user_login_submit($form_id, $form_values) {
+  global $user;
+  if ($user->uid) {
+    // To handle the edge case where this function is called during a
+    // bootstrap, check for the existence of t().
+    if (function_exists('t')) {
+      $message = t('Session opened for %name.', array('%name' => theme('placeholder', $user->name)));
+    }
+    else {
+       $message = "Session opened for ". check_plain($user->name);
+    }
+    watchdog('user', $message);
+
+    // Update the user table timestamp noting user has logged in.
+    db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $user->uid);
+
+    user_module_invoke('login', $form_values, $user);
+
+    $old_session_id = session_id();
+    session_regenerate_id();
+    db_query("UPDATE {sessions} SET sid = '%s' WHERE sid = '%s'", session_id(), $old_session_id);
+
+    // Create a timestamped final URL so that browsers don't return the user to
+    // a cached page (where it would appear as if they never logged in or out).
+    return array($_REQUEST['destination'], 'time='. time());
+  }
+}
+
+function user_authenticate($name, $pass) {
+  global $user;
+
+  // Try to log in the user locally. Don't set $user unless successful.
+  if ($account = user_load(array('name' => $name, 'pass' => $pass, 'status' => 1))) {
+    $user = $account;
+  }
+
+  // Strip name and server from ID:
+  if ($server = strrchr($name, '@')) {
+    $name = substr($name, 0, strlen($name) - strlen($server));
+    $server = substr($server, 1);
+  }
+
+  // When possible, determine corresponding external auth source. Invoke
+  // source, and log in user if successful:
+  if (!$user->uid && $server && $result = user_get_authmaps("$name@$server")) {
+    if (module_invoke(key($result), 'auth', $name, $pass, $server)) {
+      $user = user_external_load("$name@$server");
+      watchdog('user', t('External load by %user using module %module.', array('%user' => theme('placeholder', $name .'@'. $server), '%module' => theme('placeholder', key($result)))));
+    }
+    else {
+      $error = t('Invalid password for %s.', array('%s' => theme('placeholder', $name .'@'. $server)));
+    }
+  }
+
+  // Try each external authentication source in series. Register user if
+  // successful.
+  else if (!$user->uid && $server) {
+    foreach (module_list() as $module) {
+      if (module_hook($module, 'auth')) {
+        if (module_invoke($module, 'auth', $name, $pass, $server)) {
+          if (variable_get('user_register', 1) == 1) {
+            $account = user_load(array('name' => "$name@$server"));
+            if (!$account->uid) { // Register this new user.
+              $user = user_save('', array('name' => "$name@$server", 'pass' => user_password(), 'init' => "$name@$server", 'status' => 1, "authname_$module" => "$name@$server"));
+              watchdog('user', t('New external user: %user using module %module.', array('%user' => theme('placeholder', $name .'@'. $server), '%module' => theme('placeholder', $module))), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+  return $user;
+}
+
+/**
+ * Menu callback; logs the current user out, and redirects to the home page.
+ */
+function user_logout() {
+  global $user;
+
+  watchdog('user', t('Session closed for %name.', array('%name' => theme('placeholder', $user->name))));
+
+  // Destroy the current session:
+  session_destroy();
+  module_invoke_all('user', 'logout', NULL, $user);
+
+  // We have to use $GLOBALS to unset a global variable:
+  $user = user_load(array('uid' => 0));
+
+  // The time prevents caching.
+  drupal_goto(NULL, 'time='. time());
+}
+
+function user_pass() {
+
+  // Display form:
+  $form['name'] = array('#type' => 'textfield',
+    '#title' => t('Username'),
+    '#size' => 30,
+    '#maxlength' => 60,
+  );
+  $form['mail'] = array('#type' => 'textfield',
+    '#title' => t('E-mail address'),
+    '#size' => 30,
+    '#maxlength' => 64,
+  );
+  $form['submit'] = array('#type' => 'submit',
+    '#value' => t('E-mail new password'),
+    '#weight' => 2,
+  );
+  return drupal_get_form('user_pass', $form);
+}
+
+function user_pass_validate() {
+  global $form_values;
+
+  $name = $form_values['name'];
+  $mail = $form_values['mail'];
+  if ($name && !($form_values['account'] = user_load(array('name' => $name, 'status' => 1)))) {
+    form_set_error('name', t('Sorry. The username %name is not recognized.', array('%name' => theme('placeholder', $name))));
+  }
+  else if ($mail && !($form_values['account'] = user_load(array('mail' => $mail, 'status' => 1)))) {
+    form_set_error('mail', t('Sorry. The e-mail address %email is not recognized.', array('%email' => theme('placeholder', $mail))));
+  }
+  else if (!$mail && !$name) {
+    form_set_error('password', t('You must provide either a username or e-mail address.'));
+  }
+}
+
+function user_pass_submit($form_id, $form_values) {
+  global $base_url;
+
+  $account = $form_values['account'];
+  $from = variable_get('site_mail', ini_get('sendmail_from'));
+
+  // Mail one time login URL and instructions.
+  $variables = array('%username' => $account->name, '%site' => variable_get('site_name', 'drupal'), '%login_url' => user_pass_reset_url($account), '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $account->mail, '%date' => format_date(time()), '%login_uri' => url('user', NULL, NULL, TRUE), '%edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE));
+  $subject = _user_mail_text('pass_subject', $variables);
+  $body = _user_mail_text('pass_body', $variables);
+  $headers = "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from";
+  $mail_success = user_mail($account->mail, $subject, $body, $headers);
+
+  if ($mail_success) {
+    watchdog('user', t('Password reset instructions mailed to %name at %email.', array('%name' => ''. $account->name .'', '%email' => ''. $account->mail .'')));
+    drupal_set_message(t('Further instructions have been sent to your e-mail address.'));
+  }
+  else {
+    watchdog('user', t('Error mailing password reset instructions to %name at %email.', array('%name' => theme('placeholder', $account->name), '%email' => theme('placeholder', $account->mail))), WATCHDOG_ERROR);
+    drupal_set_message(t('Unable to send mail. Please contact the site admin.'));
+  }
+  return 'user';
+}
+
+function theme_user_pass($form) {
+  $output = '
                          '. t('Enter your username or your e-mail address.') .'
                          ';
+  $output .= form_render($form);
+  return $output;
+}
+
+/**
+ * Menu callback; process one time login link and redirects to the user page on success.
+ */
+function user_pass_reset($uid, $timestamp, $hashed_pass, $action = NULL) {
+  global $user;
+
+  // Check if the user is already logged in. The back button is often the culprit here.
+  if ($user->uid) {
+    drupal_set_message(t('You have already used this one-time login link. It is not necessary to use this link to login anymore. You are already logged in.'));
+    drupal_goto();
+  }
+  else {
+    // Time out, in seconds, until login URL expires. 24 hours = 86400 seconds.
+    $timeout = 86400;
+    $current = time();
+    // Some redundant checks for extra security ?
+    if ($timestamp < $current && $account = user_load(array('uid' => $uid, 'status' => 1)) ) {
+      // No time out for first time login.
+      if ($account->login && $current - $timestamp > $timeout) {
+        drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.'));
+        drupal_goto('user/password');
+      }
+      else if ($account->uid && $timestamp > $account->login && $timestamp < $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) {
+        // First stage is a confirmation form, then login
+        if ($action == 'login') {
+          watchdog('user', t('User %name used one-time login link at time %timestamp.', array('%name' => "$account->name", '%timestamp' => $timestamp)));
+          // Update the user table noting user has logged in.
+          // And this also makes this hashed password a one-time-only login.
+          db_query("UPDATE {users} SET login = %d WHERE uid = %d", time(), $account->uid);
+          // Now we can set the new user.
+          $user = $account;
+          // And proceed with normal login, going to user page.
+          user_module_invoke('login', $edit, $user);
+          drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'));
+          drupal_goto('user/'. $user->uid .'/edit');
+        }
+        else {
+          $form['message'] = array('#value' => t('
                          This is a one-time login for %user_name and will expire on %expiration_date
                          Click on this button to login to the site and change your password.
                          ', array('%user_name' => theme('placeholder',$account->name), '%expiration_date' => format_date($timestamp + $timeout))));
+          $form['help'] = array('#value' => t('
                          This login can be used only once.
                          '));
+          $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
+          $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login");
+          return drupal_get_form('user_pass_reset', $form);
+        }
+      }
+      else {
+        drupal_set_message(t('You have tried to use a one-time login link which has either been used or is no longer valid. Please request a new one using the form below.'));
+        drupal_goto('user/password');
+      }
+    }
+    else {
+      // Deny access, no more clues.
+      // Everything will be in the watchdog's URL for the administrator to check.
+      drupal_access_denied();
+    }
+  }
+}
+
+function user_pass_reset_url($account) {
+  $timestamp = time();
+  return url("user/reset/$account->uid/$timestamp/".user_pass_rehash($account->pass, $timestamp, $account->login), NULL, NULL, TRUE);
+}
+
+function user_pass_rehash($password, $timestamp, $login) {
+  return md5($timestamp . $password . $login);
+}
+
+function user_register() {
+  global $user;
+
+  $admin = user_access('administer users');
+
+  // If we aren't admin but already logged on, go to the
+  // user page instead. The added time prevents caching.
+  if (!$admin && $user->uid) {
+    drupal_goto('user/'. $user->uid, 'time='. time());
+  }
+
+  // Display the registration form.
+  if (!$admin) {
+    $form['user_registration_help'] = array('#type' => 'markup', '#value' => filter_xss_admin(variable_get('user_registration_help', '')));
+  }
+  $affiliates = user_auth_help_links();
+  if (!$admin && count($affiliates) > 0) {
+    $affiliates = implode(', ', $affiliates);
+    $form['affiliates'] = array('#type' => 'markup', '#value' => '
                          '. t('Note: if you have an account with one of our affiliates (%s), you may login now instead of registering.', array('%s' => $affiliates, '%login_uri' => url('user'))) .'
                          ');
+  }
+  $form['name'] = array('#type' => 'textfield',
+    '#title' => t('Username'),
+    '#size' => 30,
+    '#maxlength' => 60,
+    '#description' => t('Your full name or your preferred username; only letters, numbers and spaces are allowed.'),
+    '#required' => TRUE);
+  $form['mail'] = array('#type' => 'textfield',
+    '#title' => t('E-mail address'),
+    '#size' => 30,
+    '#maxlength' => 64,
+    '#description' => t('A password and instructions will be sent to this e-mail address, so make sure it is accurate.'),
+    '#required' => TRUE,
+  );
+  if ($admin) {
+    $form['pass'] = array('#type' => 'password',
+      '#title' => t('Password'),
+      '#size' => 30,
+      '#description' => t('Provide a password for the new account.'),
+      '#required' => TRUE,
+    );
+    $form['notify'] = array(
+     '#type' => 'checkbox',
+     '#title' => t('Notify user of new account')
+    );
+  }
+  $extra = _user_forms($null, $null, $null, 'register');
+
+  // Only display form_group around default fields if there are other groups.
+  if ($extra) {
+    $form['account'] = array('#type' => 'fieldset', '#title' => t('Account information'));
+    $form['account']['name'] = $form['name'];
+    $form['account']['mail'] = $form['mail'];
+    $form['account']['pass'] = $form['pass'];
+    $form['account']['notify'] = $form['notify'];
+    unset($form['name'], $form['mail'], $form['pass'], $form['notify']);
+    $form = array_merge($form, $extra);
+  }
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Create new account'), '#weight' => 30);
+
+  return drupal_get_form('user_register', $form);
+}
+
+function user_register_validate($form_id, $form_values) {
+  user_module_invoke('validate', $form_values, $form_values, 'account');
+}
+
+function user_register_submit($form_id, $form_values) {
+  global $base_url;
+
+  $admin = user_access('administer users');
+
+  $mail = $form_values['mail'];
+  $name = $form_values['name'];
+  $pass = $admin ? $form_values['pass'] : user_password();
+  $notify = $form_values['notify'];
+  $from = variable_get('site_mail', ini_get('sendmail_from'));
+
+  if (!$admin && array_intersect(array_keys($form_values), array('uid', 'roles', 'init', 'session', 'status'))) {
+    watchdog('security', t('Detected malicious attempt to alter protected user fields.'), WATCHDOG_WARNING);
+    return 'user/register';
+  }
+
+  $account = user_save('', array_merge($form_values, array('pass' => $pass, 'init' => $mail, 'status' => ($admin || variable_get('user_register', 1) == 1))));
+  watchdog('user', t('New user: %name %email.', array('%name' => theme('placeholder', $name), '%email' => theme('placeholder', '<'. $mail .'>'))), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $account->uid .'/edit'));
+
+  $variables = array('%username' => $name, '%site' => variable_get('site_name', 'drupal'), '%password' => $pass, '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $mail, '%date' => format_date(time()), '%login_uri' => url('user', NULL, NULL, TRUE), '%edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE), '%login_url' => user_pass_reset_url($account));
+
+  // The first user may login immediately, and receives a customized welcome e-mail.
+  if ($account->uid == 1) {
+    user_mail($mail, t('Drupal user account details for %s', array('%s' => $name)), strtr(t("%username,\n\nYou may now login to %uri using the following username and password:\n\n  username: %username\n  password: %password\n\n%edit_uri\n\n--drupal"), $variables), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+    drupal_set_message(t('
                          Welcome to Drupal. You are user #1, which gives you full and immediate access.  All future registrants will receive their passwords via e-mail, so please make sure your website e-mail address is set properly under the general settings on the settings page.
                           Your password is %pass. You may change your password below.
                          ', array('%pass' => $pass, '%settings' => url('admin/settings'))));
+    user_authenticate($account->name, trim($pass));
+
+    // Set the installed schema version of the system module to the most recent version.
+    include_once './includes/install.inc';
+    drupal_set_installed_schema_version('system', max(drupal_get_schema_versions('system')));
+
+    return 'user/1/edit';
+  }
+  else {
+    if ($admin && !$notify) {
+      drupal_set_message(t('Created a new user account. No e-mail has been sent.'));
+
+      return 'admin/user';
+    }
+    else if ($account->status || $notify) {
+      // Create new user account, no administrator approval required.
+      $subject = $notify ? _user_mail_text('admin_subject', $variables) : _user_mail_text('welcome_subject', $variables);
+      $body = $notify ? _user_mail_text('admin_body', $variables) : _user_mail_text('welcome_body', $variables);
+
+      user_mail($mail, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+
+      if ($notify) {
+        drupal_set_message(t('Password and further instructions have been e-mailed to the new user %user.', array('%user' => theme('placeholder', $name))));
+        return 'admin/user';
+      }
+      else {
+        drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.'));
+        return '';
+      }
+    }
+    else {
+      // Create new user account, administrator approval required.
+      $subject = _user_mail_text('approval_subject', $variables);
+      $body = _user_mail_text('approval_body', $variables);
+
+      user_mail($mail, $subject, $body, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+      user_mail(variable_get('site_mail', ini_get('sendmail_from')), $subject, t("%u has applied for an account.\n\n%uri", array('%u' => $account->name, '%uri' => url("user/$account->uid/edit", NULL, NULL, TRUE))), "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+      drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.
                          In the meantime, your password and further instructions have been sent to your e-mail address.'));
+
+    }
+  }
+}
+
+function user_edit_form($uid, $edit) {
+  // Account information:
+  $form['account'] = array('#type' => 'fieldset',
+    '#title' => t('Account information'),
+  );
+  if (user_access('change own username') || user_access('administer users')) {
+    $form['account']['name'] = array('#type' => 'textfield',
+      '#title' => t('Username'),
+      '#default_value' => $edit['name'],
+      '#maxlength' => 60,
+      '#description' => t('Your full name or your preferred username: only letters, numbers and spaces are allowed.'),
+      '#required' => TRUE,
+    );
+  }
+  $form['account']['mail'] = array('#type' => 'textfield',
+    '#title' => t('E-mail address'),
+    '#default_value' => $edit['mail'],
+    '#maxlength' => 64,
+    '#description' => t('Insert a valid e-mail address. All e-mails from the system will be sent to this address. The e-mail address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by e-mail.'),
+    '#required' => TRUE,
+  );
+  $form['account']['pass'] = array('#type' => 'password_confirm',
+    '#title' => t('Password'),
+    '#description' => t('To change the current user password, enter the new password in both fields.'),
+  );
+  if (user_access('administer users')) {
+    $form['account']['status'] = array('#type' => 'radios', '#title' => t('Status'), '#default_value' => $edit['status'], '#options' => array(t('Blocked'), t('Active')));
+  }
+  if (user_access('administer access control')) {
+    $roles = user_roles(1);
+    unset($roles[DRUPAL_AUTHENTICATED_RID]);
+    if ($roles) {
+      $form['account']['roles'] = array('#type' => 'checkboxes', '#title' => t('Roles'), '#default_value' => array_keys((array)$edit['roles']), '#options' => $roles, '#description' => t('The user receives the combined permissions of the %au role, and all roles selected here.', array('%au' => theme('placeholder', t('authenticated user')))));
+    }
+  }
+
+  // Picture/avatar:
+  if (variable_get('user_pictures', 0)) {
+    $form['picture'] = array('#type' => 'fieldset', '#title' => t('Picture'), '#weight' => 1);
+    $picture = theme('user_picture', (object)$edit);
+    if ($picture) {
+      $form['picture']['current_picture'] = array('#type' => 'markup', '#value' => $picture);
+      $form['picture']['picture_delete'] = array('#type' => 'checkbox', '#title' => t('Delete picture'), '#description' => t('Check this box to delete your current picture.'));
+    } else {
+      $form['picture']['picture_delete'] = array('#type' => 'hidden');
+    }
+    $form['picture']['picture_upload'] = array('#type' => 'file', '#title' => t('Upload picture'), '#size' => 48, '#description' => t('Your virtual face or picture.  Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) .' '. variable_get('user_picture_guidelines', ''));
+  }
+
+  return $form;
+}
+
+function _user_edit_validate($uid, &$edit) {
+  $user = user_load(array('uid' => $uid));
+  // Validate the username:
+  if (user_access('change own username') || user_access('administer users') || arg(1) == 'register') {
+    if ($error = user_validate_name($edit['name'])) {
+      form_set_error('name', $error);
+    }
+    else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(name) = LOWER('%s')", $uid, $edit['name'])) > 0) {
+      form_set_error('name', t('The name %name is already taken.', array('%name' => theme('placeholder', $edit['name']))));
+    }
+    else if (drupal_is_denied('user', $edit['name'])) {
+      form_set_error('name', t('The name %name has been denied access.', array('%name' => theme('placeholder', $edit['name']))));
+    }
+  }
+
+  // Validate the e-mail address:
+  if ($error = user_validate_mail($edit['mail'])) {
+    form_set_error('mail', $error);
+  }
+  else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
+    form_set_error('mail', t('The e-mail address %email is already taken.', array('%email' => theme('placeholder', $edit['mail']))));
+  }
+  else if (drupal_is_denied('mail', $edit['mail'])) {
+    form_set_error('mail', t('The e-mail address %email has been denied access.', array('%email' => theme('placeholder', $edit['mail']))));
+  }
+
+  // If required, validate the uploaded picture.
+  if ($file = file_check_upload('picture_upload')) {
+    user_validate_picture($file, $edit, $user);
+  }
+}
+
+function _user_edit_submit($uid, &$edit) {
+  $user = user_load(array('uid' => $uid));
+  // Delete picture if requested, and if no replacement picture was given.
+  if ($edit['picture_delete']) {
+    if ($user->picture && file_exists($user->picture)) {
+      file_delete($user->picture);
+    }
+    $edit['picture'] = '';
+  }
+  if (isset($edit['roles'])) {
+    $edit['roles'] = array_filter($edit['roles']);
+  }
+}
+
+function user_edit($category = 'account') {
+  global $user;
+
+  $account = user_load(array('uid' => arg(1)));
+  if ($account === FALSE) {
+    drupal_set_message(t('The account does not exist or has already been deleted.'));
+    drupal_goto('admin/user');
+  }
+  $edit = $_POST['op'] ? $_POST['edit'] : (array)$account;
+
+  if (arg(2) == 'delete') {
+    if ($edit['confirm']) {
+      db_query('DELETE FROM {users} WHERE uid = %d', $account->uid);
+      db_query('DELETE FROM {sessions} WHERE uid = %d', $account->uid);
+      db_query('DELETE FROM {users_roles} WHERE uid = %d', $account->uid);
+      db_query('DELETE FROM {authmap} WHERE uid = %d', $account->uid);
+      watchdog('user', t('Deleted user: %name %email.', array('%name' => theme('placeholder', $account->name), '%email' => theme('placeholder', '<'. $account->mail .'>'))), WATCHDOG_NOTICE);
+      drupal_set_message(t('The account has been deleted.'));
+      module_invoke_all('user', 'delete', $edit, $account);
+      drupal_goto('admin/user');
+    }
+    else {
+      return confirm_form('user_confirm_delete', array(), t('Are you sure you want to delete the account %name?', array('%name' => theme('placeholder', $account->name))), 'user/'. $account->uid, t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'), t('Delete'), t('Cancel'));
+    }
+  }
+  else if ($_POST['op'] == t('Delete')) {
+    if ($_REQUEST['destination']) {
+      $destination = drupal_get_destination();
+      unset($_REQUEST['destination']);
+    }
+    // Note: we redirect from user/uid/edit to user/uid/delete to make the tabs disappear.
+    drupal_goto("user/$account->uid/delete", $destination);
+  }
+
+  $form = _user_forms($edit, $account, $category);
+  $form['_category'] = array('#type' => 'value', '#value' => $category);
+  $form['_account'] = array('#type' => 'value', '#value' => $account);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'), '#weight' => 30);
+  if (user_access('administer users')) {
+    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'), '#weight' => 31);
+  }
+  $form['#attributes']['enctype'] = 'multipart/form-data';
+
+  drupal_set_title($account->name);
+  return drupal_get_form('user_edit', $form);
+}
+
+function user_edit_validate($form_id, $form_values) {
+  user_module_invoke('validate', $form_values, $form_values['_account'], $form_values['_category']);
+  // Validate input to ensure that non-privileged users can't alter protected data.
+  if ((!user_access('administer users') && array_intersect(array_keys($form_values), array('uid', 'init', 'session'))) || (!user_access('administer access control') && isset($form_values['roles']))) {
+    $message = t('Detected malicious attempt to alter protected user fields.');
+    watchdog('security', $message, WATCHDOG_WARNING);
+    // set this to a value type field
+    form_set_error('category', $message);
+  }
+}
+
+function user_edit_submit($form_id, $form_values) {
+  $account = $form_values['_account'];
+  $category = $form_values['_category'];
+  unset($form_values['_account'], $form_values['submit'], $form_values['delete'], $form_values['form_id'], $form_values['_category']);
+  user_module_invoke('submit', $form_values, $account, $category);
+  user_save($account, $form_values, $category);
+  // Delete that user's menu cache.
+  cache_clear_all('menu:'. $account->uid, TRUE);
+  drupal_set_message(t('The changes have been saved.'));
+  return 'user/'. $account->uid;
+}
+
+function user_view($uid = 0) {
+  global $user;
+
+  $account = user_load(array('uid' => $uid));
+  if ($account === FALSE || ($account->access == 0 && !user_access('administer users'))) {
+    return drupal_not_found();
+  }
+  // Retrieve and merge all profile fields:
+  $fields = array();
+  foreach (module_list() as $module) {
+    if ($data = module_invoke($module, 'user', 'view', '', $account)) {
+      foreach ($data as $category => $items) {
+        foreach ($items as $item) {
+          $item['class'] = "$module-". $item['class'];
+          $fields[$category][] = $item;
+        }
+      }
+    }
+  }
+  drupal_set_title($account->name);
+  return theme('user_profile', $account, $fields);
+}
+
+/*** Administrative features ***********************************************/
+
+function _user_mail_text($messageid, $variables = array()) {
+
+  // Check if an admin setting overrides the default string.
+  if ($admin_setting = variable_get('user_mail_' . $messageid, FALSE)) {
+    return strtr($admin_setting, $variables);
+  }
+  // No override, return with default strings.
+  else {
+    switch ($messageid) {
+      case 'welcome_subject':
+        return t('Account details for %username at %site', $variables);
+      case 'welcome_body':
+        return t("%username,\n\nThank you for registering at %site. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n--  %site team", $variables);
+      case 'admin_subject':
+        return t('An administrator created an account for you at %site', $variables);
+      case 'admin_body':
+        return t("%username,\n\nA site administrator at %site has created an account for you. You may now log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://www.drupal.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n--  %site team", $variables);
+      case 'approval_subject':
+        return t('Account details for %username at %site (pending admin approval)', $variables);
+      case 'approval_body':
+        return t("%username,\n\nThank you for registering at %site. Your application for an account is currently pending approval. Once it has been granted, you may log in to %login_uri using the following username and password:\n\nusername: %username\npassword: %password\n\nYou may also log in by clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once.\n\nAfter logging in, you may wish to change your password at %edit_uri\n\nYour new %site membership also enables to you to login to other Drupal powered websites (e.g. http://www.drop.org/) without registering. Just use the following Drupal ID and password:\n\nDrupal ID: %username@%uri_brief\npassword: %password\n\n\n--  %site team", $variables);
+      case 'pass_subject':
+        return t('Replacement login information for %username at %site', $variables);
+      case 'pass_body':
+        return t("%username,\n\nA request to reset the password for your account has been made at %site.\n\nYou may now log in to %uri_brief clicking on this link or copying and pasting it in your browser:\n\n%login_url\n\nThis is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used.\n\nAfter logging in, you will be redirected to %edit_uri so you can change your password.", $variables);
+    }
+  }
+}
+
+function user_configure_settings() {
+}
+
+/**
+ * Menu callback: check an access rule
+ */
+function user_admin_access_check() {
+  $form['user'] = array('#type' => 'fieldset', '#title' => t('Username'));
+  $form['user']['test'] = array('#type' => 'textfield', '#title' => '', '#description' => t('Enter a username to check if it will be denied or allowed.'), '#size' => 30, '#maxlength' => 64);
+  $form['user']['type'] = array('#type' => 'hidden', '#value' => 'user');
+  $form['user']['submit'] = array('#type' => 'submit', '#value' => t('Check username'));
+  $output .= drupal_get_form('check_user', $form, 'user_admin_access_check');
+  unset($form); // prevent endless loop?
+
+  $form['mail'] = array('#type' => 'fieldset', '#title' => t('E-mail'));
+  $form['mail']['test'] = array('#type' => 'textfield', '#title' => '', '#description' => t('Enter an e-mail address to check if it will be denied or allowed.'), '#size' => 30, '#maxlength' => 64);
+  $form['mail']['type'] = array('#type' => 'hidden', '#value' => 'mail');
+  $form['mail']['submit'] = array('#type' => 'submit', '#value' => t('Check e-mail'));
+  $output .= drupal_get_form('check_mail', $form, 'user_admin_access_check');
+  unset($form); // prevent endless loop?
+
+  $form['host'] = array('#type' => 'fieldset', '#title' => t('Hostname'));
+  $form['host']['test'] = array('#type' => 'textfield', '#title' => '', '#description' => t('Enter a hostname or IP address to check if it will be denied or allowed.'), '#size' => 30, '#maxlength' => 64);
+  $form['host']['type'] = array('#type' => 'hidden', '#value' => 'host');
+  $form['host']['submit'] = array('#type' => 'submit', '#value' => t('Check hostname'));
+  $output .= drupal_get_form('check_host', $form, 'user_admin_access_check');
+  unset($form); // prevent endless loop?
+
+  return $output;
+}
+
+function user_admin_access_check_validate($form_id, $edit) {
+  if (empty($edit['test'])) {
+    form_set_error($edit['type'], t('No value entered. Please enter a test string and try again.'));
+  }
+}
+
+function user_admin_access_check_submit($form_id, $edit) {
+  switch ($edit['type']) {
+    case 'user':
+      if (drupal_is_denied('user', $edit['test'])) {
+        drupal_set_message(t('The username %name is not allowed.', array('%name' => theme('placeholder', $edit['test']))));
+      }
+      else {
+        drupal_set_message(t('The username %name is allowed.', array('%name' => theme('placeholder', $edit['test']))));
+      }
+      break;
+    case 'mail':
+      if (drupal_is_denied('mail', $edit['test'])) {
+        drupal_set_message(t('The e-mail address %mail is not allowed.', array('%mail' => theme('placeholder', $edit['test']))));
+      }
+      else {
+        drupal_set_message(t('The e-mail address %mail is allowed.', array('%mail' => theme('placeholder', $edit['test']))));
+      }
+      break;
+    case 'host':
+      if (drupal_is_denied('host', $edit['test'])) {
+        drupal_set_message(t('The hostname %host is not allowed.', array('%host' => theme('placeholder', $edit['test']))));
+      }
+      else {
+        drupal_set_message(t('The hostname %host is allowed.', array('%host' => theme('placeholder', $edit['test']))));
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+/**
+ * Menu callback: add an access rule
+ */
+function user_admin_access_add($mask = NULL, $type = NULL) {
+  if ($edit = $_POST['edit']) {
+    if (!$edit['mask']) {
+      form_set_error('mask', t('You must enter a mask.'));
+    }
+    else {
+      $aid = db_next_id('{access}_aid');
+      db_query("INSERT INTO {access} (aid, mask, type, status) VALUES ('%s', '%s', '%s', %d)", $aid, $edit['mask'], $edit['type'], $edit['status']);
+      drupal_set_message(t('The access rule has been added.'));
+      drupal_goto('admin/access/rules');
+    }
+  }
+  else {
+    $edit['mask'] = $mask;
+    $edit['type'] = $type;
+  }
+
+  $form = _user_admin_access_form($edit);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Add rule'));
+
+  return drupal_get_form('access_rule', $form);
+}
+
+/**
+ * Menu callback: delete an access rule
+ */
+function user_admin_access_delete($aid = 0) {
+  $access_types = array('user' => t('username'), 'mail' => t('e-mail'));
+  $edit = db_fetch_object(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = %d', $aid));
+
+  $form = array();
+  $form['aid'] = array('#type' => 'hidden', '#value' => $aid);
+  $output = confirm_form('user_admin_access_delete_confirm', $form,
+                  t('Are you sure you want to delete the %type rule for %rule?', array('%type' => $access_types[$edit->type], '%rule' => theme('placeholder', $edit->mask))),
+                  'admin/access/rules',
+                  t('This action cannot be undone.'),
+                  t('Delete'),
+                  t('Cancel'));
+  return $output;
+}
+
+function user_admin_access_delete_confirm_submit($form_id, $edit) {
+  db_query('DELETE FROM {access} WHERE aid = %d', $edit['aid']);
+  drupal_set_message(t('The access rule has been deleted.'));
+  return 'admin/access/rules';
+}
+
+/**
+ * Menu callback: edit an access rule
+ */
+function user_admin_access_edit($aid = 0) {
+  if ($edit = $_POST['edit']) {
+    if (!$edit['mask']) {
+      form_set_error('mask', t('You must enter a mask.'));
+    }
+    else {
+      db_query("UPDATE {access} SET mask = '%s', type = '%s', status = '%s' WHERE aid = %d", $edit['mask'], $edit['type'], $edit['status'], $aid);
+      drupal_set_message(t('The access rule has been saved.'));
+      drupal_goto('admin/access/rules');
+    }
+  }
+  else {
+    $edit = db_fetch_array(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = %d', $aid));
+  }
+  $form = _user_admin_access_form($edit);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Save rule'));
+
+  return drupal_get_form('access_rule', $form);
+}
+
+function _user_admin_access_form($edit) {
+  $form['status'] = array(
+    '#type' => 'radios',
+    '#title' => t('Access type'),
+    '#default_value' => 0,
+    '#options' => array('1' => t('Allow'), '0' => t('Deny')),
+  );
+  $type_options = array('user' => t('Username'), 'mail' => t('E-mail'), 'host' => t('Host'));
+  $form['type'] = array(
+    '#type' => 'radios',
+    '#title' => t('Rule type'),
+    '#default_value' => (isset($type_options[$edit['type']]) ? $edit['type'] : 'user'),
+    '#options' => $type_options,
+  );
+  $form['mask'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Mask'),
+    '#size' => 30,
+    '#maxlength' => 64,
+    '#default_value' => $edit['mask'],
+    '#description' => '%: '. t('Matches any number of characters, even zero characters') .'.
                          _: '. t('Matches exactly one character.'),
+    '#required' => TRUE,
+  );
+  return $form;
+}
+
+/**
+ * Menu callback: list all access rules
+ */
+function user_admin_access() {
+  $header = array(array('data' => t('Access type'), 'field' => 'status'), array('data' => t('Rule type'), 'field' => 'type'), array('data' =>t('Mask'), 'field' => 'mask'), array('data' => t('Operations'), 'colspan' => 2));
+  $result = db_query("SELECT aid, type, status, mask FROM {access}". tablesort_sql($header));
+  $access_types = array('user' => t('username'), 'mail' => t('e-mail'), 'host' => t('host'));
+  $rows = array();
+  while ($rule = db_fetch_object($result)) {
+    $rows[] = array($rule->status ? t('allow') : t('deny'), $access_types[$rule->type], $rule->mask, l(t('edit'), 'admin/access/rules/edit/'. $rule->aid), l(t('delete'), 'admin/access/rules/delete/'. $rule->aid));
+  }
+  if (count($rows) == 0) {
+    $rows[] = array(array('data' => ''. t('There are currently no access rules.') .'', 'colspan' => 5));
+  }
+  $output .= theme('table', $header, $rows);
+
+  return $output;
+}
+
+/**
+ * Retrieve an array of roles matching specified conditions.
+ *
+ * @param $membersonly
+ *   Set this to TRUE to exclude the 'anonymous' role.
+ * @param $permission
+ *   A string containing a permission. If set, only roles containing that permission are returned.
+ *
+ * @return
+ *   An associative array with the role id as the key and the role name as value.
+ */
+function user_roles($membersonly = 0, $permission = 0) {
+  $roles = array();
+
+  if ($permission) {
+    $result = db_query("SELECT r.* FROM {role} r INNER JOIN {permission} p ON r.rid = p.rid WHERE p.perm LIKE '%%%s%%' ORDER BY r.name", $permission);
+  }
+  else {
+    $result = db_query('SELECT * FROM {role} ORDER BY name');
+  }
+  while ($role = db_fetch_object($result)) {
+    if (!$membersonly || ($membersonly && $role->rid != DRUPAL_ANONYMOUS_RID)) {
+      $roles[$role->rid] = $role->name;
+    }
+  }
+  return $roles;
+}
+
+/**
+ * Menu callback: administer permissions.
+ */
+function user_admin_perm($str_rids = NULL) {
+  if (preg_match('/^([0-9]+[+ ])*[0-9]+$/', $str_rids)) {
+    // The '+' character in a query string may be parsed as ' '.
+    $rids = preg_split('/[+ ]/', $str_rids);
+  }
+
+  if($rids) {
+    $breadcrumbs = drupal_get_breadcrumb();
+    $breadcrumbs[] = l(t('all roles'), 'admin/access');
+    drupal_set_breadcrumb($breadcrumbs);
+    $result = db_query('SELECT r.rid, p.perm FROM {role} r LEFT JOIN {permission} p ON r.rid = p.rid WHERE r.rid IN (%s) ORDER BY name', implode(', ', $rids));
+  }
+  else {
+    $result = db_query('SELECT r.rid, p.perm FROM {role} r LEFT JOIN {permission} p ON r.rid = p.rid ORDER BY name');
+  }
+
+  // Compile role array:
+  $roles = array();
+  while ($role = db_fetch_object($result)) {
+    $role_permissions[$role->rid] = $role->perm;
+  }
+
+  if($rids) {
+    $result = db_query('SELECT rid, name FROM {role} r WHERE r.rid IN (%s) ORDER BY name', implode(', ', $rids));
+  }
+  else {
+    $result = db_query('SELECT rid, name FROM {role} ORDER BY name');
+  }
+  $role_names = array();
+  while ($role = db_fetch_object($result)) {
+    $role_names[$role->rid] = $role->name;
+  }
+
+  // Render role/permission overview:
+  $options = array();
+  foreach (module_list(FALSE, FALSE, TRUE) as $module) {
+    if ($permissions = module_invoke($module, 'perm')) {
+      $form['permission'][] = array('#type' => 'markup', '#value' => t('%module module', array('%module' => $module)));
+      asort($permissions);
+      foreach ($permissions as $perm) {
+        $options[$perm] = '';
+        $form['permission'][$perm] = array('#type' => 'markup', '#value' => t($perm));
+        foreach ($role_names as $rid => $name) {
+          // Builds arrays for checked boxes for each role
+          if (strstr($role_permissions[$rid], $perm)) {
+            $status[$rid][] = $perm;
+          }
+        }
+      }
+    }
+  }
+  // Have to build checkboxes here after checkbox arrays are built
+  foreach ($role_names as $rid => $name) {
+    $form['checkboxes'][$rid] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => $status[$rid]);
+    $form['role_names'][$rid] = array('#type' => 'markup', '#value' => l($name, 'admin/access/'. $rid), '#tree' => TRUE);
+  }
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Save permissions'));
+
+  return drupal_get_form('user_admin_perm', $form);
+}
+
+function theme_user_admin_perm($form) {
+  foreach (element_children($form['permission']) as $key) {
+    // Don't take form control structures
+    if (is_array($form['permission'][$key])) {
+      $row = array();
+      // Module name
+      if (is_numeric($key)) {
+        $row[] = array('data' => form_render($form['permission'][$key]), 'class' => 'module', 'colspan' => count($form['role_names']) + 1);
+      // Permissions
+      }
+      else {
+        $row[] = array('data' => form_render($form['permission'][$key]), 'class' => 'permission');
+        foreach (element_children($form['checkboxes']) as $rid) {
+          if (is_array($form['checkboxes'][$rid])) {
+            $row[] = array('data' => form_render($form['checkboxes'][$rid][$key]), 'align' => 'center', 'title' => t($key));
+          }
+        }
+      }
+      $rows[] = $row;
+    }
+  }
+  $header[] = (t('Permission'));
+  foreach (element_children($form['role_names']) as $rid) {
+    if (is_array($form['role_names'][$rid])) {
+      $header[] = form_render($form['role_names'][$rid]);
+    }
+  }
+  $output = theme('table', $header, $rows, array('id' => 'permissions'));
+  $output .= form_render($form);
+  return $output;
+}
+
+function user_admin_perm_submit($form_id, $edit) {
+  // Save permissions:
+  $result = db_query('SELECT * FROM {role}');
+  while ($role = db_fetch_object($result)) {
+    if(isset($edit[$role->rid])) {
+      // Delete, so if we clear every checkbox we reset that role;
+      // otherwise permissions are active and denied everywhere.
+      db_query('DELETE FROM {permission} WHERE rid = %d', $role->rid);
+      foreach ($edit[$role->rid] as $key => $value) {
+        if (!$value) {
+          unset($edit[$role->rid][$key]);
+        }
+      }
+      if (count($edit[$role->rid])) {
+        db_query("INSERT INTO {permission} (rid, perm) VALUES (%d, '%s')", $role->rid, implode(', ', array_keys($edit[$role->rid])));
+      }
+    }
+  }
+
+  drupal_set_message(t('The changes have been saved.'));
+
+  // Clear the cached pages and menus:
+  menu_rebuild();
+
+}
+
+/**
+ * Menu callback: administer roles.
+ */
+function user_admin_role() {
+  $edit = isset($_POST['edit']) ? $_POST['edit'] : '';
+  $op = isset($_POST['op']) ? $_POST['op'] : '';
+  $id = arg(4);
+
+  if ($op == t('Save role')) {
+    if ($edit['name']) {
+      db_query("UPDATE {role} SET name = '%s' WHERE rid = %d", $edit['name'], $id);
+      drupal_set_message(t('The changes have been saved.'));
+      drupal_goto('admin/access/roles');
+    }
+    else {
+      form_set_error('name', t('You must specify a valid role name.'));
+    }
+  }
+  else if ($op == t('Delete role')) {
+    db_query('DELETE FROM {role} WHERE rid = %d', $id);
+    db_query('DELETE FROM {permission} WHERE rid = %d', $id);
+    // Update the users who have this role set:
+    db_query('DELETE FROM {users_roles} WHERE rid = %d', $id);
+
+    drupal_set_message(t('The role has been deleted.'));
+    drupal_goto('admin/access/roles');
+  }
+  else if ($op == t('Add role')) {
+    if ($edit['name']) {
+      db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit['name']);
+      drupal_set_message(t('The role has been added.'));
+      drupal_goto('admin/access/roles');
+    }
+    else {
+      form_set_error('name', t('You must specify a valid role name.'));
+    }
+  }
+  else if ($id) {
+    // Display the role form.
+    $role = db_fetch_object(db_query('SELECT * FROM {role} WHERE rid = %d', $id));
+    $form['name'] = array('#type' => 'textfield', '#title' => t('Role name'), '#default_value' => $role->name, '#size' => 30, '#maxlength' => 64, '#description' => t('The name for this role. Example: "moderator", "editorial board", "site architect".'));
+    $form['submit'] = array('#type' => 'submit', '#value' => t('Save role'));
+    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete role'));
+    return drupal_get_form('user_admin_role', $form);
+  }
+  $form['name'] = array('#type' => 'textfield', '#size' => 32, '#maxlength' => 64);
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Add role'));
+  return drupal_get_form('user_admin_new_role', $form);
+}
+
+function theme_user_admin_new_role($form) {
+  $header = array(t('Name'), t('Operations'));
+  foreach (user_roles() as $rid => $name) {
+    if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
+      $rows[] = array($name, l(t('edit'), 'admin/access/roles/edit/'. $rid));
+    }
+    else {
+      $rows[] = array($name, ''. t('locked') .'');
+    }
+  }
+  $rows[] = array(form_render($form['name']), form_render($form['submit']));
+
+  return theme('table', $header, $rows);
+}
+
+function user_admin_account() {
+  $header = array(
+    array('data' => t('Username'), 'field' => 'u.name'),
+    array('data' => t('Status'), 'field' => 'u.status'),
+    array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'),
+    array('data' => t('Last access'), 'field' => 'u.access'),
+    t('Operations')
+  );
+  $sql = 'SELECT u.uid, u.name, u.status, u.created, u.access FROM {users} u WHERE uid != 0';
+  $sql .= tablesort_sql($header);
+  $result = pager_query($sql, 50);
+
+  $status = array(t('blocked'), t('active'));
+  while ($account = db_fetch_object($result)) {
+    $rows[] = array(theme('username', $account),
+                    $status[$account->status],
+                    format_interval(time() - $account->created),
+                    $account->access ? t('%time ago', array('%time' => format_interval(time() - $account->access))) : t('never'),
+                    l(t('edit'), "user/$account->uid/edit", array()));
+  }
+
+  $output = theme('table', $header, $rows);
+  $output .= theme('pager', NULL, 50, 0);
+  return $output;
+}
+
+function user_configure() {
+  // User registration settings.
+  $form['registration'] = array('#type' => 'fieldset', '#title' => t('User registration settings'));
+  $form['registration']['user_register'] = array('#type' => 'radios', '#title' => t('Public registrations'), '#default_value' => variable_get('user_register', 1), '#options' => array(t('Only site administrators can create new user accounts.'), t('Visitors can create accounts and no administrator approval is required.'), t('Visitors can create accounts but administrator approval is required.')));
+  $form['registration']['user_registration_help'] = array('#type' => 'textarea', '#title' => t('User registration guidelines'), '#default_value' => variable_get('user_registration_help', ''), '#description' => t('This text is displayed at the top of the user registration form.  It\'s useful for helping or instructing your users.'));
+
+  // User e-mail settings.
+  $form['email'] = array('#type' => 'fieldset', '#title' => t('User e-mail settings'));
+  $form['email']['user_mail_welcome_subject'] = array('#type' => 'textfield', '#title' => t('Subject of welcome e-mail'), '#default_value' => _user_mail_text('welcome_subject'), '#maxlength' => 180, '#description' => t('Customize the subject of your welcome e-mail, which is sent to new members upon registering.') .' '. t('Available variables are:') .' %username, %site, %password, %uri, %uri_brief, %mailto, %date, %login_uri, %edit_uri, %login_url.');
+  $form['email']['user_mail_welcome_body'] = array('#type' => 'textarea', '#title' => t('Body of welcome e-mail'), '#default_value' => _user_mail_text('welcome_body'), '#rows' => 15, '#description' => t('Customize the body of the welcome e-mail, which is sent to new members upon registering.') .' '. t('Available variables are:') .' %username, %site, %password, %uri, %uri_brief, %mailto, %login_uri, %edit_uri, %login_url.');
+  $form['email']['user_mail_admin_subject'] = array('#type' => 'textfield', '#title' => t('Subject of welcome e-mail (user created by administrator)'), '#default_value' => _user_mail_text('admin_subject'), '#maxlength' => 180, '#description' => t('Customize the subject of your welcome e-mail, which is sent to new member accounts created by an administrator.') .' '. t('Available variables are:') .' %username, %site, %password, %uri, %uri_brief, %mailto, %date, %login_uri, %edit_uri, %login_url.');
+  $form['email']['user_mail_admin_body'] = array('#type' => 'textarea', '#title' => t('Body of welcome e-mail (user created by administrator)'), '#default_value' => _user_mail_text('admin_body'), '#rows' => 15, '#description' => t('Customize the body of the welcome e-mail, which is sent to new member accounts created by an administrator.') .' '. t('Available variables are:') .' %username, %site, %password, %uri, %uri_brief, %mailto, %login_uri, %edit_uri, %login_url.');
+  $form['email']['user_mail_approval_subject'] = array('#type' => 'textfield', '#title' => t('Subject of welcome e-mail (awaiting admin approval)'), '#default_value' => _user_mail_text('approval_subject'), '#maxlength' => 180, '#description' => t('Customize the subject of your awaiting approval welcome e-mail, which is sent to new members upon registering.') .' '. t('Available variables are:') .' %username, %site, %password, %uri, %uri_brief, %mailto, %date, %login_uri, %edit_uri, %login_url.');
+  $form['email']['user_mail_approval_body'] = array('#type' => 'textarea', '#title' => t('Body of welcome e-mail (awaiting admin approval)'), '#default_value' => _user_mail_text('approval_body'), '#rows' => 15, '#description' => t('Customize the body of the awaiting approval welcome e-mail, which is sent to new members upon registering.') .' '. t('Available variables are:') .' %username, %site, %password, %uri, %uri_brief, %mailto, %login_uri, %edit_uri, %login_url.');
+  $form['email']['user_mail_pass_subject'] = array('#type' => 'textfield', '#title' => t('Subject of password recovery e-mail'), '#default_value' => _user_mail_text('pass_subject'), '#maxlength' => 180, '#description' => t('Customize the Subject of your forgotten password e-mail.') .' '. t('Available variables are:') .' %username, %site, %login_url, %uri, %uri_brief, %mailto, %date, %login_uri, %edit_uri.');
+  $form['email']['user_mail_pass_body'] = array('#type' => 'textarea', '#title' => t('Body of password recovery e-mail'), '#default_value' => _user_mail_text('pass_body'), '#rows' => 15, '#description' => t('Customize the body of the forgotten password e-mail.') .' '. t('Available variables are:') .' %username, %site, %login_url, %uri, %uri_brief, %mailto, %login_uri, %edit_uri.');
+
+  // If picture support is enabled, check whether the picture directory exists:
+  if (variable_get('user_pictures', 0)) {
+    $picture_path = file_create_path(variable_get('user_picture_path', 'pictures'));
+    file_check_directory($picture_path, 1, 'user_picture_path');
+  }
+
+  $form['pictures'] = array('#type' => 'fieldset', '#title' => t('Pictures'));
+  $form['pictures']['user_pictures'] = array('#type' => 'radios', '#title' => t('Picture support'), '#default_value' => variable_get('user_pictures', 0), '#options' => array(t('Disabled'), t('Enabled')), '#description' => t('Enable picture support.'));
+  $form['pictures']['user_picture_path'] = array('#type' => 'textfield', '#title' => t('Picture image path'), '#default_value' => variable_get('user_picture_path', 'pictures'), '#size' => 30, '#maxlength' => 255, '#description' => t('Subdirectory in the directory "%dir" where pictures will be stored.', array('%dir' => file_directory_path() .'/')));
+  $form['pictures']['user_picture_default'] = array('#type' => 'textfield', '#title' => t('Default picture'), '#default_value' => variable_get('user_picture_default', ''), '#size' => 30, '#maxlength' => 255, '#description' => t('URL of picture to display for users with no custom picture selected. Leave blank for none.'));
+  $form['pictures']['user_picture_dimensions'] = array('#type' => 'textfield', '#title' => t('Picture maximum dimensions'), '#default_value' => variable_get('user_picture_dimensions', '85x85'), '#size' => 15, '#maxlength' => 10, '#description' => t('Maximum dimensions for pictures.'));
+  $form['pictures']['user_picture_file_size'] = array('#type' => 'textfield', '#title' => t('Picture maximum file size'), '#default_value' => variable_get('user_picture_file_size', '30'), '#size' => 15, '#maxlength' => 10, '#description' => t('Maximum file size for pictures, in kB.'));
+  $form['pictures']['user_picture_guidelines'] = array('#type' => 'textarea', '#title' => t('Picture guidelines'), '#default_value' => variable_get('user_picture_guidelines', ''), '#description' => t('This text is displayed at the picture upload form in addition to the default guidelines.  It\'s useful for helping or instructing your users.'));
+
+  return system_settings_form('user_configure_settings', $form);
+}
+
+function user_admin() {
+  $edit = isset($_POST['edit']) ? $_POST['edit'] : '';
+  $op = isset($_POST['op']) ? $_POST['op'] : '';
+
+  if (empty($op)) {
+    $op = arg(2);
+  }
+
+  switch ($op) {
+    case 'search':
+    case t('Search'):
+      $output = search_form(url('admin/user/search'), $_POST['edit']['keys'], 'user') . search_data($_POST['edit']['keys'], 'user');
+      break;
+    case t('Create new account'):
+    case 'create':
+      $output = user_register();
+      break;
+    default:
+      $output = user_admin_account();
+  }
+  return $output;
+}
+
+/**
+ * Implementation of hook_help().
+ */
+function user_help($section) {
+  global $user;
+
+  switch ($section) {
+    case 'admin/help#user':
+      $output = '
                          '. t('The user module allows users to register, login, and logout. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles.  The user module supports user roles which can setup fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles anonymous - a user who has not logged in, and authenticated a user who has signed up and who has been authorized. ') .'
                          ';
+      $output .= '
                          '. t('Users can use their own name or handle and can fine tune some personal configuration settings through their individual my account page.  Registered users need to authenticate by supplying either a local username and password, or a remote username and password such as DelphiForums ID, or one from a Drupal powered website.  A visitor accessing your website is assigned an unique ID, the so-called session ID, which is stored in a cookie. For security\'s sake, the cookie does not contain personal information but acts as a key to retrieve the information stored on your server. ') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%user' => url('user'), '%admin-user' => url('admin/user'), '%admin-themes' => url('admin/themes'), '%admin-help-profile' => url('admin/help/profile'), '%admin-help-system' => url('admin/help/system')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook User page.', array('%user' => 'http://drupal.org/handbook/modules/user/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Manages the user registration and login system.');
+    case 'admin/user':
+      return t('
                          Drupal allows users to register, login, logout, maintain user profiles, etc. No participant can use his own name to post content until he signs up for a user account.
                          ');
+    case 'admin/user/create':
+    case 'admin/user/account/create':
+      return t('
                          This web page allows the administrators to register a new users by hand. Note that you cannot have a user where either the e-mail address or the username match another user in the system.
                          ');
+    case strstr($section, 'admin/access/rules'):
+      return t('
                          Set up username and e-mail address access rules for new and existing accounts (currently logged in accounts will not be logged out). If a username or e-mail address for an account matches any deny rule, but not an allow rule, then the account will not be allowed to be created or to log in. A host rule is effective for every page view, not just registrations.
                          ');
+    case 'admin/access':
+      return t('
                          Permissions let you control what users can do on your site.  Each user role (defined on the user roles page) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.
                          ', array('%role' => url('admin/access/roles')));
+    case 'admin/access/roles':
+      return t('
                          Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".
                          By default, Drupal comes with two user roles:
                          
+      
                            
+      
                          • Anonymous user: this role is used for users that don\'t have a user account or that are not authenticated.
                            • 
+      
                          • Authenticated user: this role is automatically granted to all logged in users.
                            • 
+      
                          ', array('%permissions' => url('admin/access/permissions')));
+    case 'admin/user/search':
+      return t('
                          Enter a simple pattern ("*" may be used as a wildcard match) to search for a username.  For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda".
                          ');
+    case 'admin/user/configure':
+    case 'admin/user/configure/settings':
+      return t('
                          In order to use the full power of Drupal a visitor must sign up for an account. This page lets you setup how a user signs up, logs out, the guidelines from the system about user subscriptions, and the e-mails the system will send to the user.
                          ');
+    case 'user/help#user':
+      $site = variable_get('site_name', 'this website');
+
+      $output = t("
+      
                          Distributed authentication
                          
+      
                          One of the more tedious moments in visiting a new website is filling out the registration form. Here at %site, you do not have to fill out a registration form if you are already a member of %help-links. This capability is called distributed authentication, and is unique to Drupal, the software which powers %site.
                          
+      
                          Distributed authentication enables a new user to input a username and password into the login box, and immediately be recognized, even if that user never registered at %site. This works because Drupal knows how to communicate with external registration databases. For example, lets say that new user 'Joe' is already a registered member of Delphi Forums. Drupal informs Joe on registration and login screens that he may login with his Delphi ID instead of registering with %site. Joe likes that idea, and logs in with a username of joe@remote.delphiforums.com and his usual Delphi password. Drupal then contacts the remote.delphiforums.com server behind the scenes (usually using XML-RPC, HTTP POST, or SOAP) and asks: \"Is the password for user Joe correct?\".  If Delphi replies yes, then we create a new %site account for Joe and log him into it.  Joe may keep on logging into %site in the same manner, and he will always be logged into the same account.
                          ", array('%help-links' => (implode(', ', user_auth_help_links())), '%site' => "$site", '%drupal' => 'http://drupal.org', '%delphi-forums' => 'http://www.delphiforums.com', '%xml' => 'http://www.xmlrpc.com', '%http-post' => 'http://www.w3.org/Protocols/', '%soap' => 'http://www.soapware.org'));
+
+        foreach (module_list() as $module) {
+          if (module_hook($module, 'auth')) {
+            $output .= "
                          ". module_invoke($module, 'info', 'name') .'
                          ';
+            $output .= module_invoke($module, 'help', "user/help#$module");
+          }
+        }
+
+        return $output;
+  }
+
+}
+
+/**
+ * Menu callback; Prints user-specific help information.
+ */
+function user_help_page() {
+  return user_help('user/help#user');
+}
+
+/**
+ * Retrieve a list of all user setting/information categories and sort them by weight.
+ */
+function _user_categories($account) {
+  $categories = array();
+
+  foreach (module_list() as $module) {
+    if ($data = module_invoke($module, 'user', 'categories', NULL, $account, '')) {
+      $categories = array_merge($data, $categories);
+    }
+  }
+
+  usort($categories, '_user_sort');
+
+  return $categories;
+}
+
+function _user_sort($a, $b) {
+  return $a['weight'] < $b['weight'] ? -1 : ($a['weight'] > $b['weight'] ? 1 : ($a['title'] < $b['title'] ? -1 : 1));
+}
+
+/**
+ * Retrieve a list of all form elements for the specified category.
+ */
+function _user_forms(&$edit, $account, $category, $hook = 'form') {
+  $groups = array();
+  foreach (module_list() as $module) {
+    if ($data = module_invoke($module, 'user', $hook, $edit, $account, $category)) {
+      $groups = array_merge_recursive($data, $groups);
+    }
+  }
+  uasort($groups, '_user_sort');
+
+  return empty($groups) ? FALSE : $groups;
+}
+
+/**
+ * Retrieve a pipe delimited string of autocomplete suggestions for existing users
+ */
+function user_autocomplete($string) {
+  $matches = array();
+  $result = db_query_range("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string, 0, 10);
+  while ($user = db_fetch_object($result)) {
+    $matches[$user->name] = check_plain($user->name);
+  }
+  print drupal_to_js($matches);
+  exit();
+}
diff --git a/modules/watchdog.module b/modules/watchdog.module
new file mode 100644
index 0000000..3b0822b
--- /dev/null
+++ b/modules/watchdog.module
@@ -0,0 +1,194 @@
+'. t('The watchdog module monitors your system, capturing system events in a log to be reviewed by an authorized individual at a later time.  This is useful for site administrators who want a quick overview of activities on their site. The logs also record the sequence of events, so it can be useful for debugging site errors.') .'
                          ';
+      $output .= '
                          '. t('The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the watchdog report on a regular basis to ensure their site is working properly.') .'
                          ';
+      $output .= t('
                          You can
                          
+
+', array('%admin-watchdog' => url('admin/watchdog'), '%admin-watchdog-events' => url('admin/watchdog/events')));
+      $output .= '
                          '. t('For more information please read the configuration and customization handbook Watchdog page.', array('%watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'
                          ';
+      return $output;
+    case 'admin/modules#description':
+      return t('Logs and records system events.');
+    case 'admin/logs':
+      return t('
                          The watchdog module monitors your web site, capturing system events in a log to be reviewed by an authorized individual at a later time.  The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information.  It is vital to check the watchdog report on a regular basis as it is often the only way to tell what is going on.
                          ');
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function watchdog_menu($may_cache) {
+  $items = array();
+
+  if ($may_cache) {
+    $items[] = array('path' => 'admin/logs', 'title' => t('logs'),
+      'callback' => 'watchdog_overview');
+    $items[] = array('path' => 'admin/logs/event', 'title' => t('details'),
+      'callback' => 'watchdog_event',
+      'type' => MENU_CALLBACK);
+  }
+  return $items;
+}
+
+/**
+ * Implementation of hook_cron().
+ *
+ * Remove expired log messages and flood control events.
+ */
+function watchdog_cron() {
+  db_query('DELETE FROM {watchdog} WHERE timestamp < %d', time() - variable_get('watchdog_clear', 604800));
+  db_query('DELETE FROM {flood} WHERE timestamp < %d', time() - 3600);
+}
+
+/**
+ * Implementation of hook_user().
+ */
+function watchdog_user($op, &$edit, &$user) {
+  if ($op == 'delete') {
+    db_query('UPDATE {watchdog} SET uid = 0 WHERE uid = %d', $user->uid);
+  }
+}
+
+/**
+ * Menu callback; displays a listing of log messages.
+ */
+function watchdog_overview() {
+  $icons = array(WATCHDOG_NOTICE  => '',
+                 WATCHDOG_WARNING => theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning')),
+                 WATCHDOG_ERROR   => theme('image', 'misc/watchdog-error.png', t('error'), t('error')));
+  $classes = array(WATCHDOG_NOTICE => 'watchdog-notice', WATCHDOG_WARNING => 'watchdog-warning', WATCHDOG_ERROR => 'watchdog-error');
+
+  $names['all'] = t('all messages');
+  foreach (_watchdog_get_message_types() as $type) {
+    $names[$type] = t('%type messages', array('%type' => t($type)));
+  }
+
+  if (empty($_SESSION['watchdog_overview_filter'])) {
+    $_SESSION['watchdog_overview_filter'] = 'all';
+  }
+
+  $form['filter'] = array(
+    '#type' => 'select',
+    '#title' => t('Filter by message type'),
+    '#options' => $names,
+    '#default_value' => $_SESSION['watchdog_overview_filter']
+  );
+  $form['#action'] = url('admin/logs');
+
+  $form['submit'] = array('#type' => 'submit', '#value' =>t('Filter'));
+  $output = drupal_get_form('watchdog_form_overview', $form);
+
+  $header = array(
+    ' ',
+    array('data' => t('Type'), 'field' => 'w.type'),
+    array('data' => t('Date'), 'field' => 'w.wid', 'sort' => 'desc'),
+    array('data' => t('Message'), 'field' => 'w.message'),
+    array('data' => t('User'), 'field' => 'u.name'),
+    array('data' => t('Operations'))
+  );
+
+  $sql = "SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid";
+  $tablesort = tablesort_sql($header);
+  $type = $_SESSION['watchdog_overview_filter'];
+  if ($type != 'all') {
+    $result = pager_query($sql ." WHERE w.type = '%s'". $tablesort, 50, 0, NULL, $type);
+  }
+  else {
+    $result = pager_query($sql . $tablesort, 50);
+  }
+
+  while ($watchdog = db_fetch_object($result)) {
+    $rows[] = array('data' =>
+      array(
+        // Cells
+        $icons[$watchdog->severity],
+        t($watchdog->type),
+        format_date($watchdog->timestamp, 'small'),
+        l(truncate_utf8($watchdog->message, 56, TRUE, TRUE), 'admin/logs/event/'. $watchdog->wid, array(), NULL, NULL, FALSE, TRUE),
+        theme('username', $watchdog),
+        $watchdog->link,
+      ),
+      // Attributes for tr
+      'class' => "watchdog-". preg_replace('/[^a-z]/i', '-', $watchdog->type) .' '. $classes[$watchdog->severity]
+    );
+  }
+
+  if (!$rows) {
+    $rows[] = array(array('data' => t('No log messages available.'), 'colspan' => 6));
+  }
+
+  $output .= theme('table', $header, $rows);
+  $output .= theme('pager', NULL, 50, 0);
+
+  return $output;
+}
+
+function theme_watchdog_form_overview($form) {
+  return '
                          '. form_render($form) .'
                          ';
+}
+
+function watchdog_form_overview_submit($form_id, $form) {
+  global $form_values;
+  $_SESSION['watchdog_overview_filter'] = $form_values['filter'];
+}
+
+/**
+ * Menu callback; displays details about a log message.
+ */
+function watchdog_event($id) {
+  $severity = array(WATCHDOG_NOTICE => t('notice'), WATCHDOG_WARNING => t('warning'), WATCHDOG_ERROR => t('error'));
+  $output = '';
+  $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id);
+  if ($watchdog = db_fetch_object($result)) {
+    $header = array(t('Type'), t('Date'), t('User'), t('Location'), t('Referrer'), t('Message'), t('Severity'), t('Hostname'));
+    $data = array(t($watchdog->type), format_date($watchdog->timestamp, 'large'), theme('username', $watchdog), l($watchdog->location, $watchdog->location), l($watchdog->referer, $watchdog->referer), $watchdog->message, $severity[$watchdog->severity], $watchdog->hostname);
+    $output = theme('watchdog_event', $header, $data);
+  }
+  return $output;
+}
+
+function theme_watchdog_event($header, $data) {
+  $output = '';
+  $output .= '';
+
+  $n = count($header);
+  for ($i = 0; $i < $n; $i++) {
+    $output .= '';
+  }
+
+  $output .= '
                          ' . $header[$i] . '' . $data[$i] . '
                          ';
+
+  return $output;
+}
+
+function _watchdog_get_message_types() {
+  $types = array();
+
+  $result = db_query('SELECT DISTINCT(type) FROM {watchdog} ORDER BY type');
+  while ($object = db_fetch_object($result)) {
+    $types[] = $object->type;
+  }
+
+  return $types;
+}
diff --git a/planetlab/about.php b/planetlab/about.php
new file mode 100644
index 0000000..8427c23
--- /dev/null
+++ b/planetlab/about.php
@@ -0,0 +1,41 @@
+GetPlcRelease ();
+
+print "\n";
+
+foreach ( array( "build", "tags", "rpms" ) as $field) {
+
+  print "\n";
+  print "\n";
+  $keys=array_keys($release[$field]);
+  usort($keys,"__cmp_lower");
+
+  foreach ($keys as $key) {
+    print "";
+    print "";
+  }
+}
+
+print '
                          " . ucwords($field . " details") . "
                          " . $key . ""  . $release[$field][$key] . "
                          ';
+  
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/addresses/index.php b/planetlab/addresses/index.php
new file mode 100644
index 0000000..f5c3e23
--- /dev/null
+++ b/planetlab/addresses/index.php
@@ -0,0 +1,40 @@
+person;
+$_roles= $_person['role_ids'];
+
+//print_r( $_person );
+
+
+print "
                           This page is under construction 
                          ";
+
+if( !$_GET['id'] ) {
+  
+
+}
+else {
+
+
+}
+
+// Print footer
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/events/calendar.php b/planetlab/events/calendar.php
new file mode 100644
index 0000000..494d728
--- /dev/null
+++ b/planetlab/events/calendar.php
@@ -0,0 +1,191 @@
+
+//"
+//
+echo "";
+
+echo "
+
+
+
+       
+       
+
+
+
+      
+
+
+";
+?>
\ No newline at end of file
diff --git a/planetlab/events/calendar/CalendarPopup.js b/planetlab/events/calendar/CalendarPopup.js
new file mode 100644
index 0000000..1b506c1
--- /dev/null
+++ b/planetlab/events/calendar/CalendarPopup.js
@@ -0,0 +1,504 @@
+// CONSTRUCTOR for the CalendarPopup Object
+function CalendarPopup() {
+	var c;
+	if (arguments.length>0) {
+		c = new PopupWindow(arguments[0]);
+		}
+	else {
+		c = new PopupWindow();
+		c.setSize(150,175);
+		}
+	c.offsetX = -152;
+	c.offsetY = 25;
+	c.autoHide();
+	// Calendar-specific properties
+	c.monthNames = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
+	c.monthAbbreviations = new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
+	c.dayHeaders = new Array("S","M","T","W","T","F","S");
+	c.returnFunction = "CP_tmpReturnFunction";
+	c.returnMonthFunction = "CP_tmpReturnMonthFunction";
+	c.returnQuarterFunction = "CP_tmpReturnQuarterFunction";
+	c.returnYearFunction = "CP_tmpReturnYearFunction";
+	c.weekStartDay = 0;
+	c.isShowYearNavigation = false;
+	c.displayType = "date";
+	c.disabledWeekDays = new Object();
+	c.disabledDatesExpression = "";
+	c.yearSelectStartOffset = 2;
+	c.currentDate = null;
+	c.todayText="Today";
+	c.cssPrefix="";
+	c.isShowNavigationDropdowns=false;
+	c.isShowYearNavigationInput=false;
+	window.CP_calendarObject = null;
+	window.CP_targetInput = null;
+	window.CP_dateFormat = "MM/dd/yyyy";
+	// Method mappings
+	c.copyMonthNamesToWindow = CP_copyMonthNamesToWindow;
+	c.setReturnFunction = CP_setReturnFunction;
+	c.setReturnMonthFunction = CP_setReturnMonthFunction;
+	c.setReturnQuarterFunction = CP_setReturnQuarterFunction;
+	c.setReturnYearFunction = CP_setReturnYearFunction;
+	c.setMonthNames = CP_setMonthNames;
+	c.setMonthAbbreviations = CP_setMonthAbbreviations;
+	c.setDayHeaders = CP_setDayHeaders;
+	c.setWeekStartDay = CP_setWeekStartDay;
+	c.setDisplayType = CP_setDisplayType;
+	c.setDisabledWeekDays = CP_setDisabledWeekDays;
+	c.addDisabledDates = CP_addDisabledDates;
+	c.setYearSelectStartOffset = CP_setYearSelectStartOffset;
+	c.setTodayText = CP_setTodayText;
+	c.showYearNavigation = CP_showYearNavigation;
+	c.showCalendar = CP_showCalendar;
+	c.hideCalendar = CP_hideCalendar;
+	c.getStyles = getCalendarStyles;
+	c.refreshCalendar = CP_refreshCalendar;
+	c.getCalendar = CP_getCalendar;
+	c.select = CP_select;
+	c.setCssPrefix = CP_setCssPrefix;
+	c.showNavigationDropdowns = CP_showNavigationDropdowns;
+	c.showYearNavigationInput = CP_showYearNavigationInput;
+	c.copyMonthNamesToWindow();
+	// Return the object
+	return c;
+	}
+function CP_copyMonthNamesToWindow() {
+	// Copy these values over to the date.js 
+	if (typeof(window.MONTH_NAMES)!="undefined" && window.MONTH_NAMES!=null) {
+		window.MONTH_NAMES = new Array();
+		for (var i=0; i\n";
+		result += '
                          STARTEND
                              
+        
+
+
+
+
+
+Select Date
+   
+
+ 
+ 
+
+
+
+Select Date
+
                          \n';
+		}
+	else {
+		result += '
                          \n';
+		result += '
                          \n';
+		result += '
                          \n';
+		}
+	// Code for DATE display (default)
+	// -------------------------------
+	if (this.displayType=="date" || this.displayType=="week-end") {
+		if (this.currentDate==null) { this.currentDate = now; }
+		if (arguments.length > 0) { var month = arguments[0]; }
+			else { var month = this.currentDate.getMonth()+1; }
+		if (arguments.length > 1 && arguments[1]>0 && arguments[1]-0==arguments[1]) { var year = arguments[1]; }
+			else { var year = this.currentDate.getFullYear(); }
+		var daysinmonth= new Array(0,31,28,31,30,31,30,31,31,30,31,30,31);
+		if ( ( (year%4 == 0)&&(year%100 != 0) ) || (year%400 == 0) ) {
+			daysinmonth[2] = 29;
+			}
+		var current_month = new Date(year,month-1,1);
+		var display_year = year;
+		var display_month = month;
+		var display_date = 1;
+		var weekday= current_month.getDay();
+		var offset = 0;
+		
+		offset = (weekday >= this.weekStartDay) ? weekday-this.weekStartDay : 7-this.weekStartDay+weekday ;
+		if (offset > 0) {
+			display_month--;
+			if (display_month < 1) { display_month = 12; display_year--; }
+			display_date = daysinmonth[display_month]-offset+1;
+			}
+		var next_month = month+1;
+		var next_month_year = year;
+		if (next_month > 12) { next_month=1; next_month_year++; }
+		var last_month = month-1;
+		var last_month_year = year;
+		if (last_month < 1) { last_month=12; last_month_year--; }
+		var date_class;
+		if (this.type!="WINDOW") {
+			result += "";
+			}
+		result += '\n';
+		var refresh = windowref+'CP_refreshCalendar';
+		var refreshLink = 'javascript:' + refresh;
+		if (this.isShowNavigationDropdowns) {
+			result += '';
+			result += '';
+
+			result += '';
+			}
+		else {
+			if (this.isShowYearNavigation) {
+				result += '';
+				result += '';
+				result += '';
+				result += '';
+
+				result += '';
+				if (this.isShowYearNavigationInput) {
+					result += '';
+					}
+				else {
+					result += '';
+					}
+				result += '';
+				}
+			else {
+				result += '\n';
+				result += '\n';
+				result += '\n';
+				}
+			}
+		result += '
                           <'+this.monthNames[month-1]+'> <'+year+'><<'+this.monthNames[month-1]+' '+year+'>>
                          \n';
+		result += '\n';
+		result += '\n';
+		for (var j=0; j<7; j++) {
+
+			result += '\n';
+			}
+		result += '\n';
+		for (var row=1; row<=6; row++) {
+			result += '\n';
+			for (var col=1; col<=7; col++) {
+				var disabled=false;
+				if (this.disabledDatesExpression!="") {
+					var ds=""+display_year+LZ(display_month)+LZ(display_date);
+					eval("disabled=("+this.disabledDatesExpression+")");
+					}
+				var dateClass = "";
+				if ((display_month == this.currentDate.getMonth()+1) && (display_date==this.currentDate.getDate()) && (display_year==this.currentDate.getFullYear())) {
+					dateClass = "cpCurrentDate";
+					}
+				else if (display_month == month) {
+					dateClass = "cpCurrentMonthDate";
+					}
+				else {
+					dateClass = "cpOtherMonthDate";
+					}
+				if (disabled || this.disabledWeekDays[col-1]) {
+					result += '	\n';
+					}
+				else {
+					var selected_date = display_date;
+					var selected_month = display_month;
+					var selected_year = display_year;
+					if (this.displayType=="week-end") {
+						var d = new Date(selected_year,selected_month-1,selected_date,0,0,0,0);
+						d.setDate(d.getDate() + (7-col));
+						selected_year = d.getYear();
+						if (selected_year < 1000) { selected_year += 1900; }
+						selected_month = d.getMonth()+1;
+						selected_date = d.getDate();
+						}
+					result += '	\n';
+					}
+				display_date++;
+				if (display_date > daysinmonth[display_month]) {
+					display_date=1;
+					display_month++;
+					}
+				if (display_month > 12) {
+					display_month=1;
+					display_year++;
+					}
+				}
+			result += '';
+			}
+		var current_weekday = now.getDay() - this.weekStartDay;
+		if (current_weekday < 0) {
+			current_weekday += 7;
+			}
+		result += '\n';
+		result += '	
                          '+this.dayHeaders[(this.weekStartDay+j)%7]+'
                          '+display_date+''+display_date+'
                          \n';
+		if (this.disabledDatesExpression!="") {
+			var ds=""+now.getFullYear()+LZ(now.getMonth()+1)+LZ(now.getDate());
+			eval("disabled=("+this.disabledDatesExpression+")");
+			}
+		if (disabled || this.disabledWeekDays[current_weekday+1]) {
+			result += '		'+this.todayText+'\n';
+			}
+		else {
+			result += '		'+this.todayText+'\n';
+			}
+		result += '		
                          \n';
+		result += '	
                          \n';
+	}
+
+	// Code common for MONTH, QUARTER, YEAR
+	// ------------------------------------
+	if (this.displayType=="month" || this.displayType=="quarter" || this.displayType=="year") {
+		if (arguments.length > 0) { var year = arguments[0]; }
+		else { 
+			if (this.displayType=="year") {	var year = now.getFullYear()-this.yearSelectStartOffset; }
+			else { var year = now.getFullYear(); }
+			}
+		if (this.displayType!="year" && this.isShowYearNavigation) {
+			result += "";
+			result += '\n';
+			result += '	\n';
+			result += '	\n';
+			result += '	\n';
+			result += '
                          <<'+year+'>>
                          \n';
+			}
+		}
+		
+	// Code for MONTH display 
+	// ----------------------
+	if (this.displayType=="month") {
+		// If POPUP, write entire HTML document
+		result += '\n';
+		for (var i=0; i<4; i++) {
+			result += '';
+			for (var j=0; j<3; j++) {
+				var monthindex = ((i*3)+j);
+				result += '';
+				}
+			result += '';
+			}
+		result += '
                          '+this.monthAbbreviations[monthindex]+'
                          \n';
+		}
+	
+	// Code for QUARTER display
+	// ------------------------
+	if (this.displayType=="quarter") {
+		result += '
                          \n';
+		for (var i=0; i<2; i++) {
+			result += '';
+			for (var j=0; j<2; j++) {
+				var quarter = ((i*2)+j+1);
+				result += '';
+				}
+			result += '';
+			}
+		result += '

                          Q'+quarter+'

                          \n';
+		}
+
+	// Code for YEAR display
+	// ---------------------
+	if (this.displayType=="year") {
+		var yearColumnSize = 4;
+		result += "";
+		result += '\n';
+		result += '	\n';
+		result += '	\n';
+		result += '
                          <<>>
                          \n';
+		result += '\n';
+		for (var i=0; i'+currentyear+'';
+				}
+			result += '';
+			}
+		result += '
                          \n';
+		}
+	// Common
+	if (this.type == "WINDOW") {
+		result += "\n";
+		}
+	return result;
+	}
diff --git a/planetlab/events/index.php b/planetlab/events/index.php
new file mode 100644
index 0000000..3f5c779
--- /dev/null
+++ b/planetlab/events/index.php
@@ -0,0 +1,435 @@
+person;
+$_roles= $_person['role_ids'];
+
+// paginate unit
+$page_size=30;
+
+$messages = array ();
+
+$event_form = <<< EOF
+
                          
+
+
+
+
+
+
+
+
+      
+
+
+
+
+
                          
+
                           
                          
+ Events: 
+
+
+
                          
+ Persons:
+
+
+
                            
+ Nodes:
+
+
+
                          
+ Sites:
+
+
+
                          
+ Slices:
+
+
+
                          
+
                          FROM UNTIL 
                              
+        
+
+        
+
+        
+
+
+   
+    
+ 
+    
+
                          
+
+
                          
+
                          
+
+EOF;
+
+function parse_date ($day,$month,$year) {
+  // if everything empty -> unspecified date, return 0
+  if ( empty($day) && empty($month) && empty($year)) {
+    return array ("xxx",0);
+  } else {
+    // fill missing fields with current value
+    if (empty($day)) $day=date('d');
+    if (empty($month)) $month=date('M');
+    if (empty($year)) $year=date('Y');
+    $date=sprintf("%s %s %s",$day,$month,$year);
+    $time=strtotime($date);
+    return array($date,$time);
+  }
+}
+
+function parse_dates () {
+  list($from_date,$from_time) = parse_date($_GET['from_d'],$_GET['from_m'],$_GET['from_y']);
+  list($until_date,$until_time) = parse_date($_GET['until_d'],$_GET['until_m'],$_GET['until_y']);
+  return array($from_date,$from_time,$until_date,$until_time);
+}
+
+function my_is_int ($x) {
+    return (is_numeric($x) ? intval($x) == $x : false);
+}
+
+function truncate ($text,$numb,$etc = "...") {
+  if (strlen($text) > $numb) {
+    $text = substr($text, 0, $numb);
+    $text = $text.$etc;
+  }
+  return $text;
+}
+
+// layout function to refine a row's content
+function layout ($param){
+ 
+  // format time
+  $time=$param['time'];
+  $date= date('d M Y H:i' ,$time);
+  $param['time']=$date;
+
+  // the call button
+  $message=htmlentities($param['message'], ENT_QUOTES);
+  $call=htmlentities($param['call'], ENT_QUOTES);
+  $detail_text=sprintf("message=<<%s>>\\n\\ncall=<<%s>>\\n\\nruntime=<<%f>>\\n",$message,$call,$param['runtime']);
+  $detail="%s',$call,$detail);
+  $param['call_name']=$detail;
+  unset ($param['call']);
+
+  // the message button
+  $trunc_mess=htmlentities(truncate($param['message'],40),ENT_QUOTES);
+  $detail="%s',$message,$detail);
+  $param['message']=$detail;
+
+  // shrink column name : event_id -> id - paginate_id used in paginate and does not show up
+  $param['id']=$param['event_id'] ; 
+  // so that event_id shows up
+  $param['paginate_id']=$param['event_id']; unset($param['event_id']);
+
+  //// shrink column names 
+  $param['fault']=$param['fault_code'] ; unset($param['fault_code']);
+  // seem empty on all rows - probably something that I screwed when importing tony's stuff
+  //  $param['oty']=$param['object_type'] ; unset($param['object_type']);
+  //  $param['oid']=$param['object_id'] ; unset($param['object_id']);
+  $param['otys']=$param['object_types'] ; unset($param['object_types']);
+  $param['oids']=$param['object_ids'] ; unset($param['object_ids']);
+  $param['nid']=$param['node_id'] ; unset($param['node_id']);
+  $param['pid']=$param['person_id'] ; unset($param['person_id']);
+  if (array_key_exists('auth_type',$param)) {
+    $param['at']=$param['auth_type'] ; unset($param['auth_type']);
+  }
+
+  // clears
+  unset($param['object_type']);
+  unset($param['object_id']);
+  unset($param['runtime']);
+  return $param;
+}
+
+//plc_debug('GET',$_GET);
+
+if ( !in_array ('10', $_roles)) {
+  echo "
                           You need admin role to see this page. 
                          ";
+
+ } else if (!$_GET['type']) {
+
+  echo "
                          What events would you like to consult :
                          ";
+  // print the selection frame
+  echo $event_form;
+  
+ } else {
+
+  //  // xxx this of any use at all ?
+  //  drupal_set_html_head('
+  //    
+  //    ');
+
+  // handle dates
+  list($from_date,$from_time,$until_date,$until_time) = parse_dates ();
+  if ( ($from_time != 0) && ($until_time != 0) && ($from_time > $until_time) ) {
+    $messages[] = "Warning - wrong date selection";
+  }
+  
+  $filter=array();
+  if ($from_time != 0) {
+    $filter[']time']=$from_time;
+  }
+  if ($until_time != 0) {
+    $filter['[time']=$until_time;
+  }
+
+  //////////////////////////////////////// Events
+  $type=$_GET['type'];
+  if ($type == 'Event') {
+
+   // and the filter applied for fetching events using GetEvent
+    $user_desc=$_GET['event'];
+    if ( ! empty($user_desc)) {
+      // should parse stuff like 45-90,230-3000 - some other day
+      $filter['event_id']=intval($user_desc);
+    }
+    // the filter might be void here - in python we need an empty dict but that's not what we get so
+    if (empty($filter)) {
+      $filter[']time']=0;
+    }
+    $events = $api->GetEvents($filter); 
+    if (empty($events)) {
+      $messages[] = "No event found - user input was [" . $user_desc . "]";
+    } else {
+      $title="Events matching " . ($user_desc ? $user_desc : "everything");
+      if ($from_time != 0) 
+	$title .= " From " . $from_date;
+      if ($until_time != 0) 
+	$title .= " Until " . $until_date;
+      drupal_set_title ($title);
+    }
+
+    // Show messages
+    if (!empty($messages)) {
+      print '
                            ';
+      foreach ($messages as $line) {
+	print "
                          •  $line";
+      }
+      print "
                          ";
+    }
+	
+    if ( ! empty ($events)) {
+      $events= array_map(layout,$events);
+      echo paginate( $events, "paginate_id", "Events", $page_size, "event_id");
+    }
+  } else {
+
+    switch ($type) {
+    case 'Person': 
+      $primary_key='person_id';
+      $string_key='email';
+      $user_input=$_GET['person'];
+      $method="GetPersons";
+      $object_type='Person';
+      break;
+
+    case 'Node': 
+      $primary_key='node_id';
+      $string_key='hostname';
+      $user_input=$_GET['node'];
+      $method="GetNodes";
+      $object_type='Node';
+      break;
+      
+    case 'Site': 
+      $primary_key='site_id';
+      $string_key='login_base';
+      $user_input=$_GET['site'];
+      $method="GetSites";
+      $object_type='Site';
+      break;
+
+    case 'Slice': 
+      $primary_key='slice_id';
+      $string_key='name';
+      $user_input=$_GET['slice'];
+      $method="GetSlices";
+      $object_type='Slice';
+      break;
+    }
+
+    $object_ids=array();
+    $title=sprintf('Events for type %s:',$object_type);
+    foreach ( split(",",$user_input) as $user_desc) {
+      # numeric 
+      if (my_is_int($user_desc)) {
+	$obj_check = call_user_func(array($api,$method),array(intval($user_desc)),array($primary_key));
+	if (empty ($obj_check)) {
+	  $messages[] = "No such " . $primary_key . ": " . $user_desc;
+	} else {
+	  $object_ids[] = $obj_check[0][$primary_key];
+	  $title .= $user_desc . ", " ;
+	}
+      } else {
+	# string
+	$new_object_ids=call_user_func (array($api,$method), array($string_key=>$user_desc),array($primary_key,$string_key));
+	if (empty($new_object_ids)) {
+	  $messages[] = "No " . $string_key . " matching " . $user_desc;
+	} else {
+	  foreach ($new_object_ids as $new_obj_id) {
+	    $object_ids[] = $new_obj_id[$primary_key];
+	    $title .= $new_obj_id[$primary_key] . ", ";
+	  }
+	}
+      }
+    }
+      
+    // Show messages
+    if (!empty($messages)) {
+      print '
                            ';
+      foreach ($messages as $line) {
+	print "
                          •  $line";
+      }
+      print "
                          ";
+    }
+	
+    drupal_set_title($title);
+    $events = $api->GetEventObjects(array('object_id'=>$object_ids,'object_type'=>$object_type));
+
+    $events=array_map(layout,$events);
+    echo paginate( $events, "paginate_id", "--------" . $type . " EVENTS---------", $page_size, "hostname");
+  }
+ }
+
+echo "
                          Back to Events";
+
+  // Print footer
+include 'plc_footer.php';
+
+?>
+
diff --git a/planetlab/includes/comon.png b/planetlab/includes/comon.png
new file mode 100644
index 0000000..daa35f3
Binary files /dev/null and b/planetlab/includes/comon.png differ
diff --git a/planetlab/includes/delete.png b/planetlab/includes/delete.png
new file mode 100644
index 0000000..4fe6144
Binary files /dev/null and b/planetlab/includes/delete.png differ
diff --git a/planetlab/includes/event.png b/planetlab/includes/event.png
new file mode 100644
index 0000000..d19658e
Binary files /dev/null and b/planetlab/includes/event.png differ
diff --git a/planetlab/includes/js/bsn.Ajax.js b/planetlab/includes/js/bsn.Ajax.js
new file mode 100644
index 0000000..aeec8af
--- /dev/null
+++ b/planetlab/includes/js/bsn.Ajax.js
@@ -0,0 +1,84 @@
+/**
+ *  author:		Timothy Groves - http://www.brandspankingnew.net
+ *	version:	1.0 - 2006-08-04
+ *
+ *	requires:	nothing
+ *
+ */
+
+var useBSNns;
+
+if (useBSNns)
+{
+	if (typeof(bsn) == "undefined")
+		bsn = {}
+	_bsn = bsn;
+}
+else
+{
+	_bsn = this;
+}
+
+
+
+
+
+
+
+
+
+_bsn.Ajax = function ()
+{
+	this.req = {};
+	this.isIE = false;
+}
+
+
+
+_bsn.Ajax.prototype.makeRequest = function (url, meth, onComp, onErr)
+{
+	
+	if (meth != "POST")
+		meth = "GET";
+	
+	this.onComplete = onComp;
+	this.onError = onErr;
+	
+	var pointer = this;
+	
+	// branch for native XMLHttpRequest object
+	if (window.XMLHttpRequest)
+	{
+		this.req = new XMLHttpRequest();
+		this.req.onreadystatechange = function () { pointer.processReqChange() };
+		this.req.open("GET", url, true); //
+		this.req.send(null);
+	// branch for IE/Windows ActiveX version
+	}
+	else if (window.ActiveXObject)
+	{
+		this.req = new ActiveXObject("Microsoft.XMLHTTP");
+		if (this.req)
+		{
+			this.req.onreadystatechange = function () { pointer.processReqChange() };
+			this.req.open(meth, url, true);
+			this.req.send();
+		}
+	}
+}
+
+
+_bsn.Ajax.prototype.processReqChange = function()
+{
+	
+	// only if req shows "loaded"
+	if (this.req.readyState == 4) {
+		// only if "OK"
+		if (this.req.status == 200)
+		{
+			this.onComplete( this.req );
+		} else {
+			this.onError( this.req.status );
+		}
+	}
+}
\ No newline at end of file
diff --git a/planetlab/includes/js/bsn.AutoSuggest.js b/planetlab/includes/js/bsn.AutoSuggest.js
new file mode 100644
index 0000000..fcea5e5
--- /dev/null
+++ b/planetlab/includes/js/bsn.AutoSuggest.js
@@ -0,0 +1,336 @@
+/**
+ *  author:		Timothy Groves - http://www.brandspankingnew.net
+ *	version:	1.0 - 2006-08-03
+ *
+ *	requires:	bsn.DOM.js
+ *				bsn.Ajax.js
+ *
+ */
+
+var useBSNns;
+
+if (useBSNns)
+{
+	if (typeof(bsn) == "undefined")
+		bsn = {}
+	_bsn = bsn;
+}
+else
+{
+	_bsn = this;
+}
+
+
+if (typeof(_bsn.DOM) == "undefined")
+	_bsn.DOM = {}
+	
+
+
+
+
+
+
+
+_bsn.AutoSuggest = function (fldID, param)
+{
+	if (!document.getElementById)
+		return false;
+	
+	this.fld = _bsn.DOM.getElement(fldID);
+
+	if (!this.fld)
+		return false;
+		
+		
+	this.nInputChars = 0;
+	this.aSuggestions = [];
+	this.iHighlighted = 0;
+	
+	
+	// parameters object
+	this.oP = (param) ? param : {};
+	// defaults	
+	if (!this.oP.minchars)		this.oP.minchars = 1;
+	if (!this.oP.method)		this.oP.meth = "get";
+	if (!this.oP.varname)		this.oP.varname = "input";
+	if (!this.oP.className)		this.oP.className = "autosuggest";
+	if (!this.oP.timeout)		this.oP.timeout = 2500;
+	if (!this.oP.delay)			this.oP.delay = 500;
+	if (!this.oP.maxheight && this.oP.maxheight !== 0)		this.oP.maxheight = 250;
+	if (!this.oP.cache)			this.oP.cache = true;
+	
+	var pointer = this;
+	
+	this.fld.onkeyup = function () { pointer.getSuggestions( this.value ) };
+	this.fld.setAttribute("autocomplete","off");
+}
+
+
+
+_bsn.AutoSuggest.prototype.getSuggestions = function (val)
+{
+
+	if (val.length == this.nInputChars)
+		return false;
+	
+	if (val.length < this.oP.minchars)
+	{
+		this.nInputChars = val.length;
+		this.aSuggestions = [];
+		this.clearSuggestions();
+		return false;
+	}
+	
+	
+	if (val.length>this.nInputChars && this.aSuggestions.length && this.oP.cache)
+	{
+		// get from cache
+		var arr = [];
+		for (var i=0;i this.oP.maxheight && this.oP.maxheight != 0)
+	{
+		ul.style['height'] = this.oP.maxheight;
+	}
+	
+	
+	var TAB = 9;
+	var ESC = 27;
+	var KEYUP = 38;
+	var KEYDN = 40;
+	var RETURN = 13;
+	
+	
+	
+	this.fld.onkeydown = function(ev)
+	{
+		var key = (window.event) ? window.event.keyCode : ev.keyCode;
+
+		switch(key)
+		{
+			case TAB:
+			pointer.setHighlightedValue();
+			break;
+
+			case ESC:
+			pointer.clearSuggestions();
+			break;
+
+			case KEYUP:
+			pointer.changeHighlight(key);
+			return false;
+			break;
+
+			case KEYDN:
+			pointer.changeHighlight(key);
+			return false;
+			break;
+		}
+
+	};
+
+	this.iHighlighted = 0;
+	
+	
+	// remove autosuggest after an interval
+	//
+	clearTimeout(this.toID);
+	var pointer = this;
+	this.toID = setTimeout(function () { pointer.clearSuggestions() }, this.oP.timeout);
+}
+
+
+
+
+
+
+
+
+
+_bsn.AutoSuggest.prototype.changeHighlight = function(key)
+{
+	var list = _bsn.DOM.getElement(this.idAs);
+	if (!list)
+		return false;
+	
+	
+	if (this.iHighlighted > 0)
+		list.childNodes[this.iHighlighted-1].className = "";
+	
+	if (key == 40)
+		this.iHighlighted ++;
+	else if (key = 38)
+		this.iHighlighted --;
+	
+	
+	if (this.iHighlighted > list.childNodes.length)
+		this.iHighlighted = list.childNodes.length;
+	if (this.iHighlighted < 1)
+		this.iHighlighted = 1;
+	
+	list.childNodes[this.iHighlighted-1].className = "highlight";
+	
+	//alert( list.childNodes[this.iHighlighted-1].firstChild.firstChild.nodeValue );
+	
+	this.killTimeout();
+}
+
+
+
+
+
+
+
+
+_bsn.AutoSuggest.prototype.killTimeout = function()
+{
+	clearTimeout(this.toID);
+}
+
+_bsn.AutoSuggest.prototype.resetTimeout = function()
+{
+	clearTimeout(this.toID);
+	var pointer = this;
+	this.toID = setTimeout(function () { pointer.clearSuggestions() }, 1000);
+}
+
+
+
+
+
+
+
+_bsn.AutoSuggest.prototype.clearSuggestions = function ()
+{
+	if (document.getElementById(this.idAs))
+		_bsn.DOM.removeElement(this.idAs);
+	this.fld.onkeydown = null;
+}
+
+
+
+
+
+
+
+_bsn.AutoSuggest.prototype.setHighlightedValue = function ()
+{
+	if (this.iHighlighted)
+	{
+		this.fld.value = document.getElementById(this.idAs).childNodes[this.iHighlighted-1].firstChild.firstChild.nodeValue;
+		this.killTimeout();
+		this.clearSuggestions();
+	}
+}
+
+
+
+_bsn.AutoSuggest.prototype.setValue = function (val)
+{
+	this.fld.value = val;
+	this.resetTimeout();
+}
\ No newline at end of file
diff --git a/planetlab/includes/js/bsn.DOM.js b/planetlab/includes/js/bsn.DOM.js
new file mode 100644
index 0000000..2b98e42
--- /dev/null
+++ b/planetlab/includes/js/bsn.DOM.js
@@ -0,0 +1,223 @@
+/**
+ *  author:		Timothy Groves - http://www.brandspankingnew.net
+ *	version:	1.5 - 2006-08-03
+ *
+ *	requires:	nothing
+ *
+ */
+
+var useBSNns;
+
+if (useBSNns)
+{
+	if (typeof(bsn) == "undefined")
+		bsn = {}
+	_bsn = bsn;
+}
+else
+{
+	_bsn = this;
+}
+
+
+if (typeof(_bsn.DOM) == "undefined")
+	_bsn.DOM = {}
+
+
+
+
+_bsn.DOM.createElement = function ( type, attr, cont, html )
+{
+	var ne = document.createElement( type );
+	if (!ne)
+		return false;
+		
+	for (var a in attr)
+		ne[a] = attr[a];
+		
+	if (typeof(cont) == "string" && !html)
+		ne.appendChild( document.createTextNode(cont) );
+	else if (typeof(cont) == "string" && html)
+		ne.innerHTML = cont;
+	else if (typeof(cont) == "object")
+		ne.appendChild( cont );
+
+	return ne;
+}
+
+
+
+
+
+_bsn.DOM.clearElement = function ( id )
+{
+	var ele = this.getElement( id );
+	
+	if (!ele)
+		return false;
+	
+	while (ele.childNodes.length)
+		ele.removeChild( ele.childNodes[0] );
+	
+	return true;
+}
+
+
+
+
+
+
+
+
+
+_bsn.DOM.removeElement = function ( ele )
+{
+	var e = this.getElement(ele);
+	
+	if (!e)
+		return false;
+	else if (e.parentNode.removeChild(e))
+		return true;
+	else
+		return false;
+}
+
+
+
+
+
+_bsn.DOM.replaceContent = function ( id, cont, html )
+{
+	var ele = this.getElement( id );
+	
+	if (!ele)
+		return false;
+	
+	this.clearElement( ele );
+	
+	if (typeof(cont) == "string" && !html)
+		ele.appendChild( document.createTextNode(cont) );
+	else if (typeof(cont) == "string" && html)
+		ele.innerHTML = cont;
+	else if (typeof(cont) == "object")
+		ele.appendChild( cont );
+}
+
+
+
+
+
+
+
+
+
+_bsn.DOM.getElement = function ( ele )
+{
+	if (typeof(ele) == "undefined")
+	{
+		return false;
+	}
+	else if (typeof(ele) == "string")
+	{
+		var re = document.getElementById( ele );
+		if (!re)
+			return false;
+		else if (typeof(re.appendChild) != "undefined" ) {
+			return re;
+		} else {
+			return false;
+		}
+	}
+	else if (typeof(ele.appendChild) != "undefined")
+		return ele;
+	else
+		return false;
+}
+
+
+
+
+
+
+
+_bsn.DOM.appendChildren = function ( id, arr )
+{
+	var ele = this.getElement( id );
+	
+	if (!ele)
+		return false;
+	
+	
+	if (typeof(arr) != "object")
+		return false;
+		
+	for (var i=0;i'lorem', '2'=>'ipsum' );
+// var sel = '2';
+
+_bsn.DOM.createSelect = function ( attr, opt, sel )
+{
+	var select = this.createElement( 'select', attr );
+	for (var a in opt)
+	{
+	
+		var o = {id:a};
+		if (a == sel)	o.selected = "selected";
+		select.appendChild( this.createElement( 'option', o, opt[a] ) );
+		
+	}
+	
+	return select;
+}
+
+
+
+
+_bsn.DOM.getPos = function ( ele )
+{
+	var ele = this.getElement(ele);
+
+	var obj = ele;
+
+	var curleft = 0;
+	if (obj.offsetParent)
+	{
+		while (obj.offsetParent)
+		{
+			curleft += obj.offsetLeft
+			obj = obj.offsetParent;
+		}
+	}
+	else if (obj.x)
+		curleft += obj.x;
+
+
+	var obj = ele;
+	
+	var curtop = 0;
+	if (obj.offsetParent)
+	{
+		while (obj.offsetParent)
+		{
+			curtop += obj.offsetTop
+			obj = obj.offsetParent;
+		}
+	}
+	else if (obj.y)
+		curtop += obj.y;
+
+	return {x:curleft, y:curtop}
+}
\ No newline at end of file
diff --git a/planetlab/includes/plc_drupal.php b/planetlab/includes/plc_drupal.php
new file mode 100644
index 0000000..8034d5c
--- /dev/null
+++ b/planetlab/includes/plc_drupal.php
@@ -0,0 +1,51 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: plc_drupal.php 144 2007-03-28 07:52:20Z thierry $ $
+//
+
+if (!function_exists('drupal_set_title')) {
+  function drupal_set_title($title = NULL)
+  {
+    static $stored_title;
+
+    if (isset($title)) {
+      $stored_title = $title;
+    }
+    return $stored_title;
+  }
+}
+
+if (!function_exists('drupal_get_title')) {
+  function drupal_get_title()
+  {
+    return drupal_set_title();
+  }
+}
+
+if (!function_exists('drupal_set_html_head')) {
+  function drupal_set_html_head($data = NULL)
+  {
+    static $stored_head = '';
+
+    if (!is_null($data)) {
+      $stored_head .= $data ."\n";
+    }
+    return $stored_head;
+  }
+}
+
+if (!function_exists('drupal_get_html_head')) {
+  function drupal_get_html_head()
+  {
+    $output = "\n";
+    // XXX Insert CSS link here
+    return $output . drupal_set_html_head();
+  }
+}
+
+?>
diff --git a/planetlab/includes/plc_footer.php b/planetlab/includes/plc_footer.php
new file mode 100644
index 0000000..252a218
--- /dev/null
+++ b/planetlab/includes/plc_footer.php
@@ -0,0 +1,22 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: plc_footer.php 144 2007-03-28 07:52:20Z thierry $ $
+//
+
+require_once 'plc_drupal.php';
+
+if (!function_exists('drupal_page_footer')) {
+  print <<
+
+
+EOF;
+}
+
+?>
\ No newline at end of file
diff --git a/planetlab/includes/plc_functions.php b/planetlab/includes/plc_functions.php
new file mode 100644
index 0000000..91b2ef3
--- /dev/null
+++ b/planetlab/includes/plc_functions.php
@@ -0,0 +1,383 @@
+ $val ) {
+//      if( substr( $key, -3 ) == "_id" )
+      if ( $key == $table_id  ) {
+        $id[$key]= $val;
+      } else {
+        $data[$key]= $val;
+      }
+    }
+    
+    foreach( $id as $key => $val )
+      $arr2[$key]= $val;
+
+    foreach( $data as $key => $val )
+      $arr2[$key]= $val;
+
+    $as_array[]= $arr2;
+  }
+
+  $totalrows= count( $as_array );
+
+  // if array has no rows display msg
+  if( $totalrows == 0 )
+    return "Nothing to display";
+
+  // set key and break up data struct
+  $newkey= $page - 1;  
+  $newarray= array_chunk( $as_array, $limit );
+
+  // start table output
+  $echo.= "\n";
+
+  // if there is a caption add it to table
+  if( $caption )
+    $echo.= "\n";
+
+  $echo.= "";
+
+  // go through keys of one array row for table headers
+  foreach( $newarray[$newkey][0] as $key => $val ) {
+//    if( substr( $key, -3 ) != "_id" )
+    if ( $key != $table_id && $key != 'peer_id' )
+      $echo.= "";
+  }
+
+  if( $other_func == 'slivers' )
+    $echo.= "";
+
+  $echo.= "\n";
+
+  // go through array row by row to output table rows
+  foreach( $newarray[$newkey] as $assoc ) {
+
+    $extraclass="";
+    if ($assoc['peer_id']) {
+      $extraclass="plc-foreign";
+    }
+    
+
+    $echo.= "";
+
+    foreach( $assoc as $key => $val ) {
+      // do not rely on keys order
+      $id = $assoc[$table_id];
+//      if( substr( $key, -3 ) == "_id" )
+      if ($key == $table_id) {
+//	$id= $val;
+	continue;
+      } elseif( $key == $main_field ) {
+        $echo.= "";
+      } elseif ($key != 'peer_id') {
+        $echo.= "";
+      }
+
+    }
+
+    if( $other_func == 'slivers' )
+      $echo.= "";
+
+    $echo.= "\n";
+  }
+
+  // close table
+  $echo.= "
                          $caption
                          ". ucfirst( $key ) ."Slivers
                          $val";
+        if( is_array( $val ) ) {
+          $count= 1;
+          $tot= count( $val );
+          foreach( $val as $k => $v ) {
+            $echo.= $v;
+            if( $count != $tot )
+              $echo.= ", ";
+            $count++;
+          }
+        }
+        else
+          $echo.= $val;
+        $echo.= "view
                          \n";
+  $echo.= "
                          \n";
+
+  // find total number of pages
+  $numofpages = $totalrows / $limit;
+
+  // start navigation links
+  if( $numofpages > 1 ) {
+    // if page is not 1 display first and prev links
+    if( $page != 1 && $page ) {
+        $pageprev= $page - 1;
+        $echo.= "FIRST   ";
+        $echo.= " PREV ".$limit."   ";
+      }
+      else
+        $echo.= "PREV ". $limit ." ";
+
+    // if less than 30 pages display all
+    // otherwise show 30 pages but put ... inbetween
+    if( $numofpages < 30 ) {
+      $npages= $numofpages;
+      $start= 1;
+    }
+    else {
+      $npages= $page + 9;
+      if( $npages > $numofpages )
+        $npages= $numofpages;
+      $start= $page - 10;
+      if( $start < 1 )
+        $start= 1;
+      if( $page != 1 )
+        $echo.= " ... ";
+    }
+
+    // display pages, no link if current page
+    for( $i= $start; $i <= $npages; $i++ ) {
+      if( $i == $page )
+        $echo.= $i ." ";
+      else
+        $echo.= "$i ";
+
+    }
+
+    if( ( $totalrows % $limit ) != 0 ) {
+      $last= $numofpages + 1;
+      if( $i == $page )
+        $echo.= $i ." ";
+      else
+        $echo.= "$i ";
+    }
+    else
+      $last= $numofpages;
+
+    if( $numofpages >= 30 ) {
+      if( $page != $numofpages )
+        $echo.= " ... ";
+    }
+
+    if( ( $totalrows - ($limit * $page) ) > 0 ) {
+      $pagenext= $page + 1;
+      $echo.= "   NEXT ".$limit."   ";
+    }
+    else
+      $echo.= "NEXT ". $limit;
+
+    $echo.= " LAST\n";
+
+  }
+
+  return $echo;
+  
+}
+
+// function for getting the diff of multi dimention array
+function arr_diff( $a1, $a2 ) {
+  $diff= array();
+  foreach( $a1 as $k=>$v ) {
+    unset( $dv );
+    for( $x= 0; $x < count( $a2 ); $x++ ) {
+      if( is_int( $k ) ) {
+        if( array_search( $v, $a2 ) === false )
+          $dv=$v;
+        else if( is_array( $v ) )
+          $dv= arr_diff( $v, $a2[$x] );
+        if( $dv && !in_array( $dv, $diff ) )
+          $diff[]=$dv;
+      }
+      else {
+
+        if( !$a2[$k] )
+          $dv=$v;
+        else if(is_array($v))
+          $dv=arr_diff($v,$a2[$x]);
+        if($dv)
+          $diff[$x]=$dv;
+      }
+    }
+  }
+  return $diff;
+}
+
+
+function is_valid_email_addr($email)
+{
+  if( ereg("^.+@.+\\..+$", $email) )
+    return true;
+  else
+    return false;
+}
+
+function is_valid_url($url)
+{
+  if( ereg("^(http|https)://.+\..+$", strtolower($url) ) )
+    return true;
+  else
+    return false;
+}
+
+function is_valid_ip($ip)
+{
+  if( ereg("^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$", $ip ) )
+    {
+      // it's at least in the right format, now check to see if
+      // each part is equal to less than 255
+      $parts= explode( '.', $ip );
+      $count= count($parts);
+
+      for( $i= 0; $i < $count; $i++ )
+	{
+	  if( intval($parts[$i]) > 255 )
+	    return false;
+	}
+
+      return true;
+    }
+  else
+    return false;
+}
+
+
+function is_valid_network_addr($network_addr,$mask)
+{
+  $lNetwork= ip2long($network_addr);
+  $lMask= ip2long($mask);
+
+  // are they the correct format?
+  if( $lNetwork == -1 || $lMask == -1 )
+    return false;
+
+  // is network address valid for the mask?
+  if( ($lNetwork & $lMask) != $lNetwork )
+    return false;
+
+  return true;
+}
+
+
+// returns whether or not a network address is in the reserved space
+// in the case of a invalid network address, false will be returned.
+function is_reserved_network_addr($network_addr)
+{
+  $lNetwork= ip2long($network_addr);
+
+  if( $lNetwork == -1 )
+    return false;
+
+  // does the network address fall in a reserved block?
+  $reserved_ips = array (
+			 array('10.0.0.0','10.255.255.255'),
+			 array('172.16.0.0','172.31.0.0'),
+			 array('192.168.0.0','192.168.255.0')
+			 );
+  foreach ($reserved_ips as $r)
+    {
+      $min = ip2long($r[0]);
+      $max = ip2long($r[1]);
+      
+      if (($lNetwork >= $min) && ($lNetwork <= $max))
+	  return true;
+    }
+
+  return false;
+}
+
+// builds a table from an array of strings, with the given class
+function plc_make_table ($class, $messages) {
+  // pretty print the cell
+  $formatted = "";
+  if (! empty ($messages)) {
+    $formatted="";
+    foreach ($messages as $message) {
+      $formatted .= "";
+    }
+    $formatted .= "
                          " . $message . "
                          ";
+  }
+  return $formatted;
+}
+
+// shows a php variable verbatim with a heading message
+function plc_debug($message,$object) {
+  print "
                          " . $message . "
                          ";
+  print_r ($object);
+  print "
                          ";
+}
+
+// attempt to normalize the delete buttons and confirmations
+function plc_delete_button($width=15) {
+  return 'Delete this entry';
+}
+
+function plc_js_confirm($message) {
+  return "onclick=\"javascript:return confirm('Are you sure you want to delete " . $message . " ?')\"";
+}
+
+function plc_delete_link($url,$delete_message,$visible) {
+  return "" . $visible . "";
+}
+
+function plc_delete_link_button($url,$delete_message,$width=15) {
+  return "" . plc_delete_button($width) . "";
+}
+
+function plc_event_button($type,$param,$id) {
+  return '  ';
+}
+
+function plc_comon_button ($field, $value,$target="") {
+  $result='';
+  $result.=' ';
+  return $result;
+}
+
+function plc_peers_option_list ($api) {
+
+    // get list of peers
+    $peers=$api->GetPeers(NULL,array('peer_id','peername'));
+    if (count($peers)==0) {
+      $predef=array(array("peer_id"=>"","peername"=>"All (no known peers)"));
+    } else {
+      $predef=array(array("peer_id"=>"","peername"=>"All peers"),
+		    array("peer_id"=>"local","peername"=>"Local only"));
+      // show a 'foreign' button only if that makes sense
+      if (count($peers) >= 2) {
+	$predef [] = array("peer_id"=>"foreign","peername"=>"Foreign peers");
+      }
+    }
+    
+    $result="";
+    foreach ($predef as $a) {
+      $peer_line = "\n";
+      $result .= $peer_line;
+    }
+
+    if (!empty($peers)) {
+      foreach ($peers as $a) {
+	$peer_line = "\n";
+	$result .= $peer_line;
+      }
+    }
+
+    return $result;
+}
+
+?>
diff --git a/planetlab/includes/plc_header.php b/planetlab/includes/plc_header.php
new file mode 100644
index 0000000..34b552c
--- /dev/null
+++ b/planetlab/includes/plc_header.php
@@ -0,0 +1,33 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: plc_header.php 144 2007-03-28 07:52:20Z thierry $ $
+//
+
+require_once 'plc_drupal.php';
+drupal_set_html_head('');
+
+if (!function_exists('drupal_page_header')) {
+  $title = drupal_get_title();
+  $head = drupal_get_html_head();
+
+  print <<
+
+
+
+  $title
+  $head
+
+
+
+
+EOF;
+}
+
+?>
diff --git a/planetlab/includes/plc_login.php b/planetlab/includes/plc_login.php
new file mode 100644
index 0000000..b8d5b63
--- /dev/null
+++ b/planetlab/includes/plc_login.php
@@ -0,0 +1,27 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: plc_login.php 144 2007-03-28 07:52:20Z thierry $ $
+//
+
+require_once 'plc_session.php';
+global $plc, $api;
+
+if (!$plc->person) {
+  // Where they were trying to go
+  $url = $_SERVER['PHP_SELF'];
+  if (!empty($_SERVER['QUERY_STRING'])) {
+    $url .= "?" . $_SERVER['QUERY_STRING'];
+  }
+
+  Header("Location: /db/login.php?url=" . urlencode($url));
+  exit();
+}
+
+?>
diff --git a/planetlab/includes/plc_script.js b/planetlab/includes/plc_script.js
new file mode 100644
index 0000000..2c1e05d
--- /dev/null
+++ b/planetlab/includes/plc_script.js
@@ -0,0 +1,35 @@
+
+function addLoadEvent(func) {
+  if (!document.getElementById | !document.getElementsByTagName) return
+	var oldonload=window.onload
+	if (typeof window.onload != 'function') { window.onload=func }
+	else {
+		window.onload=function() { oldonload(); func() }
+	}
+}
+
+// ----------------------------------------------------------------------------- //
+
+function show(id){
+	if (!document.getElementsByTagName) return
+	if (document.getElementById(id).style.display=='block'){
+		document.getElementById(id).style.display='none'
+	}
+	else{
+		document.getElementById(id).style.display='block'
+	}
+	//  focus is moved by the href of the link to the start of the help
+}
+
+
+function hide(id){
+	if (document.getElementById) {document.getElementById(id).style.display='none'}
+}
+
+function copyValue (id1,id2) {
+  if (document.getElementById) {document.getElementById(id2).value=document.getElementById(id1).value}
+}
+
+
+// ----------------------------------------------------------------------------- //
+
diff --git a/planetlab/includes/plc_session.php b/planetlab/includes/plc_session.php
new file mode 100644
index 0000000..f3a3d0d
--- /dev/null
+++ b/planetlab/includes/plc_session.php
@@ -0,0 +1,157 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: plc_session.php 804 2007-08-31 13:58:58Z thierry $ $
+//
+
+// Usually in /etc/planetlab/php
+require_once 'plc_config.php';
+
+// Usually in /usr/share/plc_api/php
+require_once 'plc_api.php';
+
+$cwd = getcwd();
+chdir($_SERVER['DOCUMENT_ROOT']);
+$included = include_once('./includes/bootstrap.inc');
+if ($included === TRUE) {
+  // Already included, no need to bootstrap
+} elseif ($included) {
+  // Not already included, initialize Drupal session handling
+  drupal_bootstrap(DRUPAL_BOOTSTRAP_SESSION);
+} else {
+  // Drupal not available, use regular PHP session handling
+  session_start();
+}
+chdir($cwd);
+
+class PLCSession
+{
+  var $api;
+  var $person;
+  var $alt_person;
+  var $alt_auth;
+
+  function PLCSession($name = NULL, $pass = NULL)
+  {
+		$name= strtolower( $name );
+    // User API access
+    if ($name && $pass) {
+      $api = new PLCAPI(array('AuthMethod' => "password",
+			      'Username' => $name,
+			      'AuthString' => $pass));
+
+      // Authenticate user and get session key
+      $session = $api->GetSession();
+      if (!$session) {
+	return NULL;
+      }
+
+      // Change GetSession() at some point to return expires as well
+      $expires = time() + (24 * 60 * 60);
+
+      // Change to session authentication
+      $api->auth = array('AuthMethod' => "session", 'session' => $session);
+      $this->api = $api;
+
+      // Get account details
+      list($person) = $api->GetPersons(array($name));
+      $this->person = $person;
+
+      // Save session variables
+      $_SESSION['plc'] = array('auth' => $api->auth,
+			       'person' => $person,
+			       'expires' => $expires);
+     }	
+    }
+
+    function BecomePerson($person_id)
+    {
+	list($person) = $this->api->GetPersons(array($person_id));
+	if ($person)
+	{
+	    //Get this users session if one exists, create 
+	    //one otherwise
+	    list($session) = $this->api->GetSessions(array('person_id' => $person['person_id']));
+	    if (!$session)
+	    {
+		$session = $this->api->AddSession($person['person_id']);	
+	    }
+    	    else
+	    {
+		$session = $session['session_id'];
+	    }
+
+	    // Update session authentication info
+	    $this->alt_auth = $this->api->auth;
+	    $this->api->auth = array('AuthMethod' => "session", 'session' => $session);
+
+	    // su to user
+	    $this->alt_person = $this->person;
+	    $this->person = $person;
+
+	    // Save session variables
+	    $_SESSION['plc']['auth'] = $this->api->auth;
+	    $_SESSION['plc']['person'] = $this->person;
+	    $_SESSION['plc']['alt_person'] = $this->alt_person;
+            $_SESSION['plc']['alt_auth'] = $this->alt_auth;
+	    
+	}    	
+    }
+
+    function BecomeSelf()
+    {	
+	if($this->alt_auth && $this->alt_person )
+	{
+	    $this->person = $this->alt_person;
+	    $this->api->auth = $this->alt_auth;
+	    $this->alt_person = NULL;
+	    $this->alt_auth = NULL;
+
+	    $_SESSION['plc']['auth'] = $_SESSION['plc']['alt_auth'];
+	    $_SESSION['plc']['person'] = $_SESSION['plc']['alt_person'];
+	    unset($_SESSION['plc']['alt_auth']);
+            unset($_SESSION['plc']['alt_person']);
+	} 
+    }
+  
+
+  function logout()
+  {
+    $this->api->DeleteSession();
+  }
+}
+
+global $plc, $api;
+
+$plc = new PLCSession();
+
+if (!empty($_SESSION['plc'])) {
+  if ($_SESSION['plc']['expires'] > time()) {
+    $plc->person = $_SESSION['plc']['person'];
+    $plc->api = new PLCAPI($_SESSION['plc']['auth']);
+    $plc->alt_person = $_SESSION['plc']['alt_person'];
+    $plc->alt_auth = $_SESSION['plc']['alt_auth'];
+  } else {
+    // Destroy PHP session
+    session_destroy();
+  }
+}
+
+// For convenience
+$api = $plc->api;
+
+?>
diff --git a/planetlab/includes/plc_sorts.php b/planetlab/includes/plc_sorts.php
new file mode 100644
index 0000000..3c342cc
--- /dev/null
+++ b/planetlab/includes/plc_sorts.php
@@ -0,0 +1,78 @@
+ $val) {
+   if ($val == $bs[$key]) {
+     continue;
+   }
+   return ($val < $bs[$key]) ? -1 : 1;
+ }
+}
+
+function sort_nodes(&$nodes) {
+  return usort($nodes, "__cmp_nodes");
+}
+
+// node group sort on name
+function __cmp_nodegroups($a, $b) {
+	return strcasecmp($a['name'], $b['name']);
+}
+
+function sort_nodegroups(&$nodegroups) {
+	return usort($nodegroups, "__cmp_nodegroups");
+}
+
+// site sort on name
+function __cmp_sites($a, $b) {
+  return strcasecmp($a['name'], $b['name']);
+}
+
+function sort_sites(&$sites) {
+  return usort($sites, "__cmp_sites");
+}
+
+// slice sort on name
+function __cmp_slices($a, $b) {
+  return strcasecmp($a['name'], $b['name']);
+}
+
+function sort_slices(&$slices) {
+  return usort($slices, "__cmp_slices");
+}
+
+function __cmp_peers($a,$b) {
+  return strcmp($a['peername'],$b['peername']);
+}
+
+function sort_peers (&$peers) {
+  return usort ($peers, "__cmp_peers");
+}
+
+function __cmp_nodenetwork_settings($a,$b) {
+  $cat=strcmp($a['category'],$b['category']);
+  if ($cat != 0) {
+    return $cat;
+  } else {
+    return strcmp($a['name'],$b['name']);
+  }
+}
+
+function sort_nodenetwork_settings (&$nodenetwork_settings) {
+  return usort ($nodenetwork_settings,"__cmp_nodenetwork_settings");
+}
+
+?>
diff --git a/planetlab/includes/plc_style.css b/planetlab/includes/plc_style.css
new file mode 100644
index 0000000..b8feebe
--- /dev/null
+++ b/planetlab/includes/plc_style.css
@@ -0,0 +1,297 @@
+/*
+expanding links
+*/
+
+.example {padding:10px; color:#000; background:#fcf7ff; width:80%; clear:left; margin:2em auto 3em auto; border:1px solid #69c}
+a.expandlink {color:#00c}
+a:active.expandlink,
+a:focus.expandlink,
+a:hover.expandlink {color:#fff}
+
+/* 
+body styles
+*/
+/*
+body {
+	font-family: sans-serif;
+	}
+
+#container {
+
+	}
+
+#topcontent {
+	position: relative;
+	width:100%;
+	height:30px;
+	}
+
+#loginbar {
+	padding:1px;
+	float:right;
+	font-size:14px;
+	border:2px solid #072F6F;
+	}
+
+#menu {
+	position: relative;
+	}
+
+#links {
+	top: 15px;
+	float:right;
+	}
+
+#boxcontainer {
+	margin-top:5px;
+	width:100%;
+	}
+
+#topbox {
+	width:100%;
+	height:49%;
+	top:50px;
+	}
+
+#topleftcontent {
+	float:left;
+	width:49%;
+	height:98%; 
+	background:#fff;
+	padding:4px;
+	}
+
+#toprightcontent {
+	float:right;
+	width:49%;
+	height:98%;
+	background:#fff;
+	padding:4px;
+	}
+
+#bottombox {
+	margin-top:1%;
+	width: 100%;
+	height: 49%;
+	}
+
+#bottomleftcontent {
+	float: left;
+	width:49%;
+	height:98%;
+	background:#fff;
+	padding:4px;
+	}
+
+#bottomrightcontent {
+	float: right;
+	width:49%;
+	height:98%;
+	background:#fff;
+	padding:4px;
+	}
+
+#toprightcontent, #bottomrightcontent, #topleftcontent, #bottomleftcontent{
+	border:2px solid #072F6F;
+	}
+*/
+/*
+form styles
+*/
+/*
+form {
+	border: 1px solid #072F6F;
+	padding: 5px;
+	}
+
+.textarea_input {
+	background-color: #ddd;
+	color: #072F6F;
+	font-size:12px;
+	}
+
+.select_input {
+	background-color: #ddd;
+	color: #072F6F;
+	font-size:12px;
+	}
+
+.text_input {
+	font-size: 10px;
+	background-color: #CCCCCC;
+	border: 1px solid #666666;
+	}
+
+.input {
+	font-size:10px;
+	color:#072F6F;
+	background-color: #ddd;
+	}
+*/
+/*
+autocomplete
+*/
+
+body
+{
+  position: relative;
+}
+
+ul.autosuggest
+{
+  position: absolute;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  overflow-y: auto;
+}
+
+ul.autosuggest li.autosuggest
+{
+  text-align: left;
+  border-bottom: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+}
+
+ul.autosuggest li.autosuggest a:link,
+ul.autosuggest li.autosuggest a:visited
+{
+  display: block;
+  padding: 2px;
+  text-decoration: none;
+  background-color: #eee;
+}
+
+ul.autosuggest li.autosuggest a:hover,
+ul.autosuggest li.autosuggest a:active
+{
+  color: #fff;
+  background-color: #f30;
+}
+
+
+ul.autosuggest li.highlight a:link,
+ul.autosuggest li.highlight a:visited
+{
+  color: #fff;
+  background-color: #f30;
+}
+
+
+/*
+drop down
+*/
+/*
+#csstopmenu, #csstopmenu ul{
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+#csstopmenu li{
+  float: left;
+  position: relative;
+}
+
+#csstopmenu a{
+  text-decoration: none;
+}
+
+.mainitems{
+  border: 0px solid black;
+  border-left-width: 0;
+  width: 96px;
+  height: 16px;
+  padding-top: 7px;
+  background-repeat: no-repeat;
+}
+
+.mainitems:hover{
+  /*border-left-width: 1;
+  background-repeat: no-repeat;
+}
+/*
+.headerlinks a{
+  display:block;
+  padding:3px;
+  margin-right:2px;
+  font-size: 14px;
+  font-weight: bold;
+  text-align:center;
+  color: black;
+  background: #eee;
+  border:1px solid #072F6F;
+
+}
+
+.headerlinks a:hover{
+  background: #ddd;
+}
+
+.submenus{
+  display: none;
+  width: 10em;
+  position: absolute;
+
+  background-color: #E4E6EA;
+  border: 1px solid #072F6F;
+}
+
+.submenus li{
+  margin-top: 2px;
+  margin-bottom: 2px;
+  font-size:14px;
+  margin-left:10px;
+}
+
+.submenus li a{
+  display: block;
+  color: black;
+}
+
+html>body .submenus li a{ /* non IE browsers 
+  width: auto;
+}
+
+.submenus li a:hover{
+  background-color: #072F6F;
+  color: white;
+}
+
+#csstopmenu li>ul {/* non IE browsers 
+  top: auto;
+  left: auto;
+}
+
+#csstopmenu li:hover ul, li.over ul {
+  display: block;
+}
+
+html>body #clearmenu{ /* non IE browsers 
+  height: 3px;
+}
+*/
+/*
+ * TODO: CSS for PlanetLab admin pages.
+ * Must remain compatible with Drupal standard CSS names.
+ *
+ * Reid Moran 
+ * Mark Huang 
+ * Copyright (C) 2006-2007 The Trustees of Princeton University
+ *
+ * $Id: plc_style.css 918 2007-10-10 14:56:16Z thierry $
+ */
+
+/* Thierry : class used for showing foreign items */
+.plc-foreign {
+  background:  #d0d0d0;
+}
+
+/* Thierry : class used for showing various warnings */
+.plc-warning {
+  background:  orange;
+}
+*.plc-warning a:link { text-decoration: none; color:white }
+*.plc-warning a:visited { text-decoration: none; color:white }
+*.plc-warning a:hover { text-decoration: none; color:black }
diff --git a/planetlab/login.php b/planetlab/login.php
new file mode 100644
index 0000000..1f52057
--- /dev/null
+++ b/planetlab/login.php
@@ -0,0 +1,90 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: login.php 179 2007-04-03 15:46:19Z thierry $ $
+//
+
+// Get session and API handles
+require_once 'plc_session.php';
+global $plc, $api;
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Login');
+include 'plc_header.php';
+
+if (!empty($_REQUEST['email']) &&
+    !empty($_REQUEST['password'])) {
+  $plc = new PLCSession($_REQUEST['email'], $_REQUEST['password']);
+
+  if ($plc->person) {
+    // Login admins to Drupal as the superuser
+    if (in_array('admin', $plc->person['roles']) &&
+	function_exists('user_load')) {
+      global $user;
+      $user = user_load(array('uid' => 1));
+    }
+
+    if (empty($_REQUEST['url'])) {
+      // XXX Redirect to default home page
+      Header("Location: /");
+      exit();
+    } else {
+      // Make sure that redirections are always local
+      $url = urldecode($_REQUEST['url']);
+      if ($url[0] != "/") {
+	$url = "/$url";
+      }
+      Header("Location: $url");
+      exit();
+    }
+  } else {
+    // XXX Use our own stylesheet instead of drupal.css
+    print '
                          Sorry. Unrecognized username or password.
                          ';
+  }
+}
+
+$self = $_SERVER['PHP_SELF'];
+if (!empty($_SERVER['QUERY_STRING'])) {
+  $self .= "?" . $_SERVER['QUERY_STRING'];
+}
+
+$url = htmlspecialchars($_REQUEST['url']);
+
+// XXX Use our own stylesheet instead of drupal.css
+print <<
+
                          
+
+
+  
+    
+  
+
                          
+      
                          
+        
+	
+      
                          
+      
                          
+	
+	
+      
                          
+      
+      
                          Forgot your password?
                          
+      
                          Create an account
                          
+      
                          File a site registration
                          
+      
+    
                          
+
+
                          
+
+
+EOF;
+
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/logout.php b/planetlab/logout.php
new file mode 100644
index 0000000..f40226c
--- /dev/null
+++ b/planetlab/logout.php
@@ -0,0 +1,30 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: logout.php 144 2007-03-28 07:52:20Z thierry $ $
+//
+
+// Get session and API handles
+require_once 'plc_session.php';
+global $plc, $api;
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Login');
+include 'plc_header.php';
+
+// Invalidate session
+if ($plc->person) {
+  $plc->logout();
+}
+
+// Destroy PHP session
+session_destroy();
+
+Header("Location: /db/login.php");
+
+?>
\ No newline at end of file
diff --git a/planetlab/nodes/add_node.php b/planetlab/nodes/add_node.php
new file mode 100644
index 0000000..61de309
--- /dev/null
+++ b/planetlab/nodes/add_node.php
@@ -0,0 +1,303 @@
+person;
+$_roles= $_person['role_ids'];
+
+// if not a admin, pi, or tech then redirect to node index
+if( !(in_array( 10, $plc->person['role_ids'] ) || in_array( 20, $plc->person['role_ids'] ) || in_array( 40, $plc->person['role_ids'] )) ) {
+  header( "index.php" );
+ }
+
+
+// this sets up which box is to be checked the first time the page is loaded
+$method= $_POST['method'];
+if( $method == "" )
+  $method= "static";
+
+$model= $_POST['model'];
+if( $model == "" )
+  $model= "Custom";
+
+
+$submitted = false;
+
+// if submitted validate and add
+if( $_POST['submitted'] )
+{
+  $submitted = true;
+
+  $errors= array();
+
+  $method = trim($_POST['method']);
+  $ip = trim($_POST['ip']);
+  $netmask = trim($_POST['netmask']);
+  $network = trim($_POST['network']);
+  $gateway = trim($_POST['gateway']);
+  $broadcast = trim($_POST['broadcast']);
+  $dns1 = trim($_POST['dns1']);
+  $dns2 = trim($_POST['dns2']);
+  $hostname = trim($_POST['hostname']);
+  $model= trim($_POST['model']);
+
+  // used to generate error strings for static fields only
+  $static_fields= array();
+  $static_fields['netmask']= "Netmask address";
+  $static_fields['network']= "Network address";
+  $static_fields['gateway']= "Gateway address";
+  $static_fields['broadcast']= "Broadcast address";
+  $static_fields['dns1']= "Primary DNS address";
+  
+  if( $method == 'static' )
+  {
+    foreach( $static_fields as $field => $desc )
+    {
+      if( trim($_POST[$field]) == "" )
+      {
+        $errors[] = "$desc is required";
+      }
+      elseif( !is_valid_ip(trim($_POST[$field])) )
+      {
+        $errors[] = "$desc is not a valid address";
+      }
+    }
+
+    if( !is_valid_network_addr($network,$netmask) )
+    {
+      $errors[] = "The network address does not coorespond to the netmask";
+    }
+  }
+
+  if( $hostname == "" )
+  {
+    $errors[] = "Hostname is required";
+  }
+
+  if( $ip == "" )
+  {
+    $errors[] = "IP is required";
+  }
+
+  if( count($errors) == 0 )
+  {
+    $success= 1;
+
+    // add new node and its network
+    $optional_vals= array( "hostname"=>$hostname, "model"=>$model );
+
+    $site_id= $_person['site_ids'][0];
+
+    $node_id= $api->AddNode( intval( $site_id ), $optional_vals );
+
+    if ( $api->error() ) {
+       $errors[] = "Hostname already present or not valid";
+       $success= 0;
+    }
+    else
+    {
+      // now, try to add the network.
+      $optional_vals= array();
+      $optional_vals['is_primary']= true;
+      $optional_vals['ip']= $ip;
+      $optional_vals['type']= 'ipv4';
+      $optional_vals['method']= $method;
+    
+      if( $method == 'static' )
+      {
+      
+        $optional_vals['gateway']= $gateway;
+        $optional_vals['network']= $network;
+        $optional_vals['broadcast']= $broadcast;
+        $optional_vals['netmask']= $netmask;
+        $optional_vals['dns1']= $dns1;
+        if (!empty($dns2)) {
+          $optional_vals['dns2']= $dns2;
+        }
+      }
+
+      $nodenetwork_id= $api->AddNodeNetwork( $node_id, $optional_vals);
+      // if AddNodeNetwork fails, we have the node created,
+      // but no primary interface is present.
+      // The primary interface can be added later,
+      // but take a look at the possible Methods,
+      // if we specify TUN/TAP Method we will have
+      // an error on download of the configuration file
+    }
+  }
+
+}
+
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Nodes');
+include 'plc_header.php';
+
+
+?>
+
+
+
+
+
                          Node Created
                          
+
+
                          The node has been successfully added.
+
+
                          View node details and download a configuration 
+file here.
+
+
+
+
                          Add A New Node
                          
+
+
                          This page will allow you to add a new machine to your site. This must
+be done before the machine is turned on, as it will allow you to download 
+a configuration file when complete for this node.
+
+
                          Even for DHCP, you must enter the IP address of the node.
+
+ 0 )
+{
+  print( "
                          The following errors occured:" );
+  print( "
                            \n" );
+  foreach( $errors as $err )
+    {
+      print( "
                          • $err\n" );
+    }
+  print( "
                          \n" );
+}
+
+$self = $_SERVER['PHP_SELF'];
+if (!empty($_SERVER['QUERY_STRING'])) {
+  $self .= "?" . $_SERVER['QUERY_STRING'];
+}
+
+?>
+
+
                          
+
+
+
                          Node Details
                          
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                          Hostname:
                          Model:
                          
+
+
+
                          Network Settings
                          
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ 
+
+
+
+
+ 
+
+
+
+
+ 
+
+
+
+
+ 
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                          Addressing Method
+>DHCP 
+>Static
+
                          IP Address
                          Netmask
                          Network address
+
                          Gateway Address
                          Broadcast address
+
                          Primary DNS
+
                          Secondary DNS (optional)
+
                          
+
                          
+
+
diff --git a/planetlab/nodes/all_hosts.php b/planetlab/nodes/all_hosts.php
new file mode 100644
index 0000000..a838f14
--- /dev/null
+++ b/planetlab/nodes/all_hosts.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/all_ips.php b/planetlab/nodes/all_ips.php
new file mode 100644
index 0000000..eeb5d7d
--- /dev/null
+++ b/planetlab/nodes/all_ips.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/alpha_hosts.php b/planetlab/nodes/alpha_hosts.php
new file mode 100644
index 0000000..ee0f2eb
--- /dev/null
+++ b/planetlab/nodes/alpha_hosts.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/alpha_ips.php b/planetlab/nodes/alpha_ips.php
new file mode 100644
index 0000000..c8e5b7f
--- /dev/null
+++ b/planetlab/nodes/alpha_ips.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/beta_hosts.php b/planetlab/nodes/beta_hosts.php
new file mode 100644
index 0000000..6637731
--- /dev/null
+++ b/planetlab/nodes/beta_hosts.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/beta_ips.php b/planetlab/nodes/beta_ips.php
new file mode 100644
index 0000000..081ce1a
--- /dev/null
+++ b/planetlab/nodes/beta_ips.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/comon.php b/planetlab/nodes/comon.php
new file mode 100644
index 0000000..d049e71
--- /dev/null
+++ b/planetlab/nodes/comon.php
@@ -0,0 +1,122 @@
+GetNodes(array("node_id"=>array($node_id)),$fields);
+ } else if ($_GET['site_id']) {
+  $site_id=intval($_GET['site_id']);
+  $nodes=$api->GetNodes(array("site_id"=>array($site_id)),$fields);
+ } else if ($_GET['slice_id']) {
+  $slice_id=intval($_GET['slice_id']);
+  $return=$api->GetSlices(array("slice_id"=>array($slice_id)),array("node_ids"));
+  $node_ids=$return[0]['node_ids'];
+  $nodes=$api->GetNodes(array("node_id"=>$node_ids),$fields);
+ } else if (isset($_GET['peer_id'])) {
+  $peer_id=intval($_GET['peer_id']);
+  if ( ($peer_id == 0) || ($peer_id == "") )
+    $peer_id=NULL;
+  $nodes=$api->GetNodes(array("peer_id"=>$peer_id),$fields);
+ } else {
+  echo "
                           Unexpected args in comon.php 
                          \n";
+  exit();
+ }
+
+// first pass 
+// * gather nodenetwork_ids for local nodes
+// * gather hostnames for foreign nodes
+
+$nodenetwork_ids=array();
+$hostnames = array();
+
+foreach ($nodes as $node) {
+  if (empty($node['peer_id'])) {
+    foreach ($node['nodenetwork_ids'] as $id=>$nnid) {
+      $nodenetwork_ids [] = $nnid;
+    }
+  } else {
+    $hostnames[] = $node['hostname'];
+  }
+}
+  
+// Gather local ips from primary interfaces
+// fetch primary nodenetworks
+$local_ips=array();
+$nns = $api->GetNodeNetworks(array("is_primary"=>TRUE,"nodenetwork_id"=>$nodenetwork_ids),
+			     array("ip"));
+foreach ($nns as $nn) {
+  $local_ips[] = $nn['ip'];
+}
+
+plc_debug('locals',$local_ips);
+
+// for foreign hosts we're left with dns resolving them
+$remote_ips=array();
+foreach ($hostnames as $hostname) {
+  $resolved=gethostbyname($hostname);
+  // no way to notify this
+  if ($resolved == $hostname) {
+  } else {
+    $remote_ips[] = $resolved;
+  }
+}
+
+plc_debug('remote ips',$remote_ips);
+
+
+// add both lists
+$all_ips=$local_ips+$remote_ips;
+// compute comon URL
+$url = plc_comon_url_from_ips("http://comon.cs.princeton.edu",$all_ips);
+
+plc_debug('url',$url);
+
+// redirect to comon
+header("Location: " . $url);
+
+?>
diff --git a/planetlab/nodes/etc_hosts.php b/planetlab/nodes/etc_hosts.php
new file mode 100644
index 0000000..c3ee907
--- /dev/null
+++ b/planetlab/nodes/etc_hosts.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/index.php b/planetlab/nodes/index.php
new file mode 100644
index 0000000..94e23f1
--- /dev/null
+++ b/planetlab/nodes/index.php
@@ -0,0 +1,519 @@
+person;
+$_roles= $_person['role_ids'];
+
+////////////////////
+// The set of columns to fetch
+// and the filter applied for fetching sites
+$columns = array( "node_id", "hostname", "boot_state", "peer_id" ) ;
+$filter = array();
+if ( in_array( '10', $_roles ) || in_array('20', $_roles) || in_array('40',$_roles)) {
+  // admins, PIs and techs can see nodenetwork details
+  $columns [] = "nodenetwork_ids";
+ }
+
+//////////////////
+// perform post-processing on objects as returned by GetNodes
+// performs sanity check and summarize the result in a single column
+// performs in-place replacement, so passes a reference
+function layout_node ($node) {
+
+  // we need the 'nodenetwork_ids' field to do this
+  // so regular users wont run this
+  if ( ! array_key_exists ('nodenetwork_ids', $node))
+    return $node;
+    
+  $messages=array();
+  
+  // do all this stuff on local nodes only
+  if ( ! $node['peer_id'] ) {
+    // check that the node has keys
+    if (count($node['nodenetwork_ids']) == 0)
+      $messages [] = "No nodenetwork";
+    
+  }
+  // but always cleanup $node columns
+  unset ($node['nodenetwork_ids']);
+  $node['status'] = plc_make_table('plc-warning',$messages);
+  $node['comon'] = plc_comon_button("node_id",$node['node_id']);
+  return $node;
+}
+
+// if nodepattern is set then set id to that node's id.
+// we use GET rather than POST so paginate can display the right contents on subsequent pages
+// can be useful for writing bookmarkable URL's as well
+if( $_GET['nodepattern'] || $_GET['peerscope']) {
+  $nodepattern= $_GET['nodepattern'];
+  if (empty($nodepattern)) { 
+    $nodepattern="*";
+  }
+  $filter = array_merge (array( "hostname"=>$nodepattern ), $filter);
+  switch ($_GET['peerscope']) {
+  case '':
+    $peer_label="all peers";
+    break;
+  case 'local':
+    $filter=array_merge(array("peer_id"=>NULL),$filter);
+    $peer_label="local peer";
+    break;
+  case 'foreign':
+    $filter=array_merge(array("~peer_id"=>NULL),$filter);
+    $peer_label="foreign peers";
+    break;
+  default:
+    $peer_id=intval($_GET['peerscope']);
+    $filter=array_merge(array("peer_id"=>$peer_id),$filter);
+    $peer=$api->GetPeers(array("peer_id"=>$peer_id));
+    $peer_label='peer "' . $peer[0]['peername'] . '"';
+    break;
+  }
+  // need to use a hash filter for patterns to be properly handled
+  $nodes= $api->GetNodes($filter, $columns);
+  $nodes_count = count ($nodes);
+  if ( $nodes_count == 1) {
+    header( "location: index.php?id=". $nodes[0]['node_id'] );
+    exit();
+  } else if ( $nodes_count == 0) {
+    echo " No node matching $nodepattern ";
+  } else {
+    drupal_set_title ("Nodes matching $nodepattern on". $peer_label);
+    $nodes = array_map(layout_node,$nodes);
+    sort_nodes ($nodes);
+    echo paginate( $nodes, "node_id", "Nodes", 25, "hostname");
+  }
+}
+// if a site_id is given, display the site nodes only
+else if( $_GET['site_id'] ) {
+
+  $site_id= $_GET['site_id'];
+
+  // Get site info
+  $site_info= $api->GetSites( array( intval( $site_id ) ), array( "name", "node_ids" ) );
+  drupal_set_title("Nodes on site " . $site_info[0]['name']);
+
+  // Get site nodes
+  $nodes= $api->GetNodes( array_merge(array('node_id'=>$site_info[0]['node_ids']),$filter), $columns);
+
+  if ( empty ($nodes) ) {
+    echo "No node to display";
+  } else {
+
+    $nodes = array_map(layout_node,$nodes);
+    sort_nodes( $nodes );	
+
+    echo paginate( $nodes, "node_id", "Nodes", 25, "hostname");
+  }
+
+}
+// if a slice_id is given, display only the nodes related to this slice
+else if( $_GET['slice_id'] ) {
+
+  $slice_id= $_GET['slice_id'];
+
+  // Get slice infos
+  $slice_info= $api->GetSlices( array( intval( $slice_id ) ), array( "name", "node_ids" ) );
+  drupal_set_title($slice_info[0]['name']."run on");
+
+  // Get slice nodes
+  $nodes= $api->GetNodes( array_merge(array('node_id'=>$slice_info[0]['node_ids']),$filter), $columns);
+
+  if ( empty ($nodes) ) {
+    echo "No node to display";
+  } else {
+
+    $nodes = array_map(layout_node,$nodes);
+    sort_nodes( $nodes );	
+
+    echo paginate( $nodes, "node_id", "Nodes", 25, "hostname");
+    echo "
                          GetNodes( empty($filter) ? NULL : $filter, $columns );
+
+  if ( empty ($nodes) ) {
+    echo "No node to display";
+  } else {
+    
+    $nodes = array_map(layout_node,$nodes);
+    sort_nodes( $nodes );
+
+    drupal_set_html_head('
+    
+    ');
+
+    echo "
                          \n
+          
                          \n";
+
+
+echo paginate( $nodes, "node_id", "Nodes", 25, "hostname" );
+
+    echo "\n";
+  }
+}
+
+if ( $_GET['id'] ) {
+  // get the node id from the URL
+  $node_id= intval( $_GET['id'] );
+
+  // make the api call to pull that nodes DATA
+  $node_info= $api->GetNodes( array( $node_id ) );
+
+  if (empty ($node_info)) {
+    echo "No such node.";
+  } else {
+
+    // node info
+    $hostname= $node_info[0]['hostname'];
+    $boot_state= $node_info[0]['boot_state'];
+    $site_id= $node_info[0]['site_id'];
+    $model= $node_info[0]['model'];
+    $version= $node_info[0]['version'];
+
+    // arrays of ids of node info
+    $slice_ids= $node_info[0]['slice_ids'];
+    $conf_file_ids= $node_info[0]['conf_file_ids'];
+    $nodenetwork_ids= $node_info[0]['nodenetwork_ids'];
+    $nodegroup_ids= $node_info[0]['nodegroup_ids'];
+    $pcu_ids= $node_info[0]['pcu_ids'];
+    $ports= $node_info[0]['ports'];
+
+    // get peer
+    $peer_id= $node_info[0]['peer_id'];
+
+    // gets site info
+    $site_info= $api->GetSites( array( $site_id ) );
+    $site_name= $site_info[0]['name'];
+    $site_nodes= $site_info[0]['node_ids'];
+
+    if( !empty( $site_nodes ) ) {
+      // get site node info basics
+      $site_node_list= $api->GetNodes( $site_nodes );
+
+      foreach( $site_node_list as $s_node ) {
+	$site_node[$s_node['node_id']]= $s_node['hostname'];
+      }
+    }
+
+    // gets slice info for each slice
+    if( !empty( $slice_ids ) )
+      $slice_info= $api->GetSlices( $slice_ids, array( "slice_id", "name" , "peer_id" ) );
+
+    // gets conf file info
+    if( !empty( $conf_file_ids ) )
+      $conf_files= $api->GetConfFiles( $conf_file_ids );
+
+    // get node network info
+    if( !empty( $nodenetwork_ids ) )
+      $node_networks= $api->GetNodeNetworks( $nodenetwork_ids );
+
+    // gets nodegroup info
+    if( !empty( $nodegroup_ids ) )
+      $node_groups= $api->GetNodeGroups( $nodegroup_ids );
+
+    // xxx Thierry : disabling call to GetEvents, that gets the session deleted in the DB
+    // gets events 
+    //  $filter= array( "object_type"=>"Node", "object_id"=>$node_id );
+    //  $fields= array( "event_id", "person_id", "fault_code", "call_name", "call", "message", "time" );
+    //
+    //  $event_info= $api->GetEvents( $filter, $fields );
+
+    // gets pcu and port info key to both is $pcu_id
+    if( !empty( $pcu_ids ) )
+      $PCUs= $api->GetPCUs( $pcu_ids );
+
+
+    // display node info
+    if ( $peer_id) {
+      echo "
                          ";
+    }
+  
+    drupal_set_title("Node " . $hostname . " details");
+
+    $is_admin = in_array( 10, $_roles );
+    $is_pi = in_array( 20, $_roles );
+    $is_tech = in_array( 40, $_roles );
+    $in_site = in_array( $site_id, $_person['site_ids'] );
+
+    // available actions
+    if ( ! $peer_id  && ( $is_admin  || ( ($is_pi||$is_tech) && $in_site ) ) )  {
+      
+      // the javascript callback we set on the form; this
+      // (*) checks whether we clicked on 'delete'
+      // (*) in this case performs a javascript 'confirm'
+      // (*) then, notice that if we select delete, then cancel, we can select back 'Choose action' 
+      //     so submit only when value is not empty
+      $change='if (document.basic.action.value=="delete") if (! confirm("Are you sure you want to delete ' . $hostname . ' ? ") ) return false; if (document.basic.action.value!="") submit();';
+    
+      echo "
                          ";
+      if ($is_admin) {
+	echo plc_event_button("Node","node",$node_id);
+	echo "";
+      }
+      echo plc_comon_button("node_id",$node_id);
+      echo "";
+      echo "
                          \n";
+      echo "\n";
+      echo "
                          \n";
+
+      echo "
                          ";
+    }    
+
+    echo "
                          ";
+    echo "\n";
+
+    echo "\n";
+    echo "\n";
+    echo "\n";
+    
+    echo "\n";
+
+    if ( ! $peer_id  && ( $is_admin  || ( ($is_pi||$is_tech) && $in_site ) ) )  {
+      // handle legacy API
+      if ( ! method_exists ($api,"GetBootMedium")) {
+	$new_api_only=" disabled='disabled' ";
+      }
+
+      echo "\n";
+
+    }
+
+    // site info and all site nodes
+    echo "\n";
+    echo "\n";
+    echo "\n";
+
+    echo "
                          Hostname:  $hostname 
                          Model:  $model
                          Version:  $version
                          Boot State: ";
+    if ($peer_id) {
+      echo $boot_state;
+    } else {
+      echo "
                          \n";
+      echo "\n";
+      echo "\n";
+      echo "
                          ";
+    }
+    echo "
                          Download ";
+      echo "
                          \n";
+      echo "\n";
+      echo "
                          ";
+      echo "
                           
                          Site:  $site_name
                          All site nodes: ";
+    if (empty($site_node)) {
+      echo "Site has no node";
+    } else {
+      foreach( $site_node as $key => $val ) {
+	echo "$val
                          ";
+      }
+    }
+    echo "

                          \n";
+
+    if ( ! $peer_id ) {
+
+      echo "
                          \n";
+
+      // display node networks
+      if( $node_networks ) {
+	echo "
                          \n";
+	echo "\n";
+	echo "";
+	// placeholder for the delete buttons
+	if ( $is_admin || ($is_pi && $in_site)) {
+	  echo "";
+	}
+	echo "\n";
+
+	foreach( $node_networks as $node_network ) {
+	  $nn_id= $node_network['nodenetwork_id'];
+	  $nn_ip= $node_network['ip'];
+	  $nn_broad= $node_network['broadcast'];
+	  $nn_primary= $node_network['is_primary'];
+	  $nn_network= $node_network['network'];
+	  $nn_dns1= $node_network['dns1'];
+	  $nn_dns2= $node_network['dns2'];
+	  $nn_hostname= $node_network['hostname'];
+	  $nn_netmaks= $node_network['netmask'];
+	  $nn_gatewary= $node_network['gateway'];
+	  $nn_mac= $node_network['mac'];
+	  $nn_bwlimit= $node_network['bwlimit'];
+	  $nn_type= $node_network['type'];
+	  $nn_method= $node_network['method'];
+
+	  echo "";
+	  if ( $is_admin || ($is_pi && $in_site)) {
+	    echo "";
+	  }
+	  echo "";
+	  }
+	  echo "\n";
+	}
+
+	echo "
                          Node Networks
                          IP AddressMethodTypeMACBandwidth Limit
                          ";
+	    if (!$nn_primary) {
+	      echo plc_delete_link_button('node_networks.php?id=' . $nn_id . '&delete=1&submitted=1', '\\nNode Network ' . $nn_ip);
+	    } else {
+	      echo ' P ';
+	    }
+	    echo "";
+	  if( $is_admin || $is_pi || $is_tech ) {
+	    echo "$nn_ip";
+	  } else {
+	    echo "$nn_ip$nn_method$nn_type$nn_mac$nn_bwlimit
                          \n";
+
+      } else {
+	echo "
                          No Node Network.  Please add a node network to make this a usable PLC node
                          .\n";
+      }
+
+      echo "
                          Add a node network.\n";
+      echo "
                          \n";
+    }
+
+    // display node group info
+    if( !empty( $node_groups ) ) {
+
+      echo "
                          \n\n";
+      if( in_array( 10, $_roles ) ) echo "";
+      echo "\n";
+
+      foreach( $node_groups as $node_group ) {
+	echo "";
+
+	if( in_array( '10', $_roles ) || ( in_array( 20, $_roles ) && in_array( $site_id, $_person['site_ids'] ) ) || ( in_array( 40, $_roles ) && in_array( $site_id, $_person['site_ids'] ) ) ) 
+	  echo "";
+
+	echo "\n";
+
+      }
+      echo "
                          Node Groups
                          NameDescription
                          ". $node_group['name'] ."". $node_group['description'] ."Updateremove

                          \n";
+
+    } else {
+      echo "
                          This node is not in any nodegroup.
                          \n";
+    }    
+
+    // select list for adding to node group
+    // get nodegroup info
+    $full_ng_info= $api->GetNodeGroups( NULL );
+    if( empty( $node_groups ) ) {
+      $person_ng= $full_ng_info;
+    } else {
+      $person_ng= arr_diff( $full_ng_info, $node_groups );
+    }
+
+    sort_nodegroups( $person_ng );
+
+    if( !empty( $person_ng ) ) {
+      echo "
                          Select nodegroup to add this node to.
                          \n";
+      echo "\n";
+    }
+
+
+    // display slices
+    echo "
                          \n";
+    if( !empty( $slice_info ) ) {
+      sort_slices( $slice_info );
+      echo paginate( $slice_info, "slice_id", "Slices", 15, "name", "slivers", $node_id );
+    } else {
+      echo "
                          This node is not associated to any slice.
                          \n";
+    }
+
+
+    // display events - disabled, see GetEvents above
+    if( !empty( $event_info ) ) {
+      echo "
                          \n";
+      echo "
                          \n\n\n";
+
+      // display event on rows of table
+      foreach( $event_info as $event ) {
+	echo "\n";
+      }
+      echo "
                          Node Events
                          Call NameCallMessageTime
                          ". $event['call'] ."". $event['message'] ."". $event['time'] ."
                          \n";
+    }
+
+    if ( $peer_id ) {
+      echo "
                          ";
+    }
+  }
+  if( $peer_id )
+    echo "
                          ";
+  
+  echo "
                          Back to nodes list";
+  
+ }
+
+// Print footer
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/nodes/known_hosts.php b/planetlab/nodes/known_hosts.php
new file mode 100644
index 0000000..89a0a54
--- /dev/null
+++ b/planetlab/nodes/known_hosts.php
@@ -0,0 +1 @@
+
diff --git a/planetlab/nodes/node_actions.php b/planetlab/nodes/node_actions.php
new file mode 100644
index 0000000..945e259
--- /dev/null
+++ b/planetlab/nodes/node_actions.php
@@ -0,0 +1,452 @@
+ actual UpdateNode
+  //    (POST) node_id=node_id ng_add=nodegroup_id
+  //           AddNodeToNodeGroup
+  //    (POST) boot_state=boot_state node_id=node_id
+  //    (POST) ng_add=nodegroup_id
+  // (*) downloadconf.php
+  //     (GET) id=node_id [download=1]
+  //           either showed current status, or performed actual config download 
+  
+  // in this new version we support only POST behaviour with the following interface
+  // REQUIRED : node_id=node_id
+  // (*) action='prompt-update' : former node_update.php
+  // (*) action='update'
+  //     hostname=
+  //	 model=			: actually updated the node
+  // (*) action='boot-state'
+  //	 boot_state=		: changes bootstate
+  // (*) action='delete'	: deletes node
+  // (*) action='download-node-floppy' : 
+  // (*) action='download-node-iso' : 
+  // (*) action='download-node-usb' : 
+  //				: same as former downloadconf.php with download unset
+  //     if in addition POST contains a non-empty field 'download' :
+  //				: performs actual node-dep download
+  // (*) action='download-generic-iso':
+  // (*) action='download-generic-usb':
+  //				: performs actual generic download
+  // (*) action='add-in-nodegroup': should include this for compatibility, replaces ng_add, 
+  //				    though I could not figure where it's called
+
+
+  // TODO : manage a post field for displaying results of previous page
+  // see the special 'flash' in rails
+
+// delivering node-dependant images requires larger memory limit
+// trial and error, based on the current sizes
+// generic-ISO 43980800 
+// generic-usb 44720128 
+// 256M OK
+// 128M OK
+// 96M OK
+// 88M KO
+// 80M KO
+// 64M KO
+// Bottom line is, looks like we need in the order of twice the file size
+// so let's play it safe
+// Thierry - for 4.2, we need a larger area, was 100 for 4.1
+ini_set("memory_limit","150M");
+
+// Require login
+require_once 'plc_login.php';
+
+// Get session and API handles
+require_once 'plc_session.php';
+global $plc, $api;
+
+// Common functions
+require_once 'plc_functions.php';
+require_once 'plc_sorts.php';
+
+// find person roles
+$_person= $plc->person;
+$_roles= $_person['role_ids'];
+
+// NOTE: this function exits() after it completes its job, 
+// simply returning leads to html decorations being added around the contents
+function deliver_and_unlink ($filename) {
+  
+  // for security reasons we want to be able to unlink the resulting file once downloaded
+  // so simply redirecting through a header("Location:") is not good enough
+
+  $size= filesize($filename);
+
+  // headers
+  header ("Content-Type: application/octet-stream");
+  header ("Content-Transfer-Encoding: binary");
+  header ("Content-Disposition: attachment; filename=" . basename($filename) );
+  header ("Content-Length: " . $size );
+  // for getting IE to work properly
+  // from princeton cvs new_plc_www/planetlab/nodes/downloadconf.php 1.2->1.3
+  header ("Pragma: hack");
+  header ("Cache-Control: public, must-revalidate");
+
+  // outputs the whole file contents
+  print (file_get_contents($filename));
+  
+  // unlink the file
+  if (! unlink ($filename) ) {
+    // cannot unlink, but how can we notify this ?
+    // certainly not by printing
+  }
+  exit();
+}
+
+function show_download_confirm_button($api, $node_id, $action, $can_gen_config, $show_details) {
+
+  if( $can_gen_config ) {
+    if ($show_details && method_exists($api,"GetBootMedium")) {
+      $preview=$api->GetBootMedium($node_id,"node-preview","");
+      print ("
                           
                          Current node configuration contents
                          ");
+      print ("
                          \n$preview
                          \n");
+      print ("
                          ");
+    }
+    $action_labels = array ('download-node-floppy' => 'textual node config (for floppy)' ,
+			    'download-node-iso' => 'ISO image',
+			    'download-node-usb' => 'USB image' );
+    
+    $format = $action_labels [ $action ] ;
+    print( "
                          \n");
+    print ("\n");
+    print ("\n");
+    print ("\n");
+    print( "\n" );
+    print( "
                          \n" );
+  } else {
+    echo "
                          Configuration file cannot be created until missing values above are updated.";
+  }
+}
+
+// check arguments
+
+if (empty($_POST['node_id'])) {
+  header ('location:index.php');
+  exit();
+ } else {
+  $node_id = intval($_POST['node_id']);
+}
+
+$action=$_POST['action'];
+
+switch ($action) {
+
+  // ACTION: prompt-update
+  // from former node_update.php
+ case "prompt-update":
+   
+   require_once('plc_drupal.php');
+   $node_info= $api->GetNodes( array( $node_id ), array( "hostname", "model" ) );
+   drupal_set_title("Updating " . $node_info[0]['hostname']);
+   include 'plc_header.php';
+   
+   // start form
+   echo "
                          \n";
+   echo "\n";
+   echo "\n";
+   if( $_POST['error'] ) echo "". unserialize( $_POST['error'] ."\n" );
+   echo "
                          \n
+       \n
+       \n
+       
                          Hostname:  
                          Model:  
                          \n
+       
                          \n
+       
                          \n";
+   
+   echo "
                          Back to Node\n";
+   
+   break;
+
+   // ACTION: update
+   // from former node_actions.php
+ case "update":
+
+   $hostname= $_POST['hostname'];
+   $model= $_POST['model'];
+
+   $fields= array( "hostname"=>$hostname, "model"=>$model );
+   $api->UpdateNode( intval( $node_id ), $fields );
+   $error= $api->error();
+
+   if( empty( $error ) ) {
+     header( "location: index.php?id=$node_id" );
+     exit();
+   } else {
+     echo "". $error . "\n" ;
+     echo "
                           Press back to retry
                          ";
+   }
+
+   break;
+
+   // ACTION: delete
+   // from former node_actions.php
+ case "delete":
+   $api->DeleteNode( intval( $node_id ) );
+   header( "location: index.php" );
+   exit();
+   break;
+
+   // ACTION: boot-state
+   // from former node_actions.php
+ case "boot-state":
+   switch( $_POST['boot_state'] ) {
+   case 'boot':
+   case 'dbg':
+   case 'inst':
+   case 'rins':
+   case 'rcnf':
+   case 'new':
+     $api->UpdateNode( intval( $node_id ), array( "boot_state" => $_POST['boot_state'] ) );
+     header( "location: index.php?id=$node_id" );
+     exit();
+     break;
+   default:
+     print "
                           no such boot state " . $_POST['boot_state'] . "
                          ";
+     break;
+   }
+   break;
+
+  // ACTION: download-generic
+ case "download-generic-iso":
+ case "download-generic-usb":
+   
+   if ( ! method_exists($api,"GetBootMedium")) {
+     print (" API lacks support for GetBootMedium ");
+     return;
+   }
+     
+   if ($action=="download-generic-iso") {
+     $boot_action="generic-iso";
+   } else {
+     $boot_action="generic-usb";
+   }
+
+   // place the result in a random-named sub dir for clear filenames
+   $filename = $api->GetBootMedium ($node_id, $boot_action, "%d/%n-%p-%v%s");
+   $error=$api->error();
+   // NOTE. for some reason, GetBootMedium sometimes does not report an error but the
+   // file is not created - this happens e.g. when directory owmer/modes are wrong 
+   // in this case we get an empty filename
+   // see /etc/httpd/logs/error_log in this case
+   if (empty($error) && empty($filename)) {
+     $error="Unexpected error from GetBootMedium - probably wrong directory modes";
+   }    
+   if (! empty($error)) {
+     print ("
                           $error 
                          \n");
+     print ("
                          Back to node \n");
+     return ;
+   } else {
+     deliver_and_unlink ($filename);
+     exit();
+   }
+   break;
+
+   // ACTION: download-node
+   // from former downloadconf.php
+   
+ case "download-node-floppy":
+ case "download-node-iso":
+ case "download-node-usb":
+   
+   $return= $api->GetNodes( array( $node_id ) );
+   $node_detail= $return[0];
+
+   // non-admin people need to be affiliated with the right site
+   if( !in_array( 10, $_roles ) ) {
+     $node_site_id = $node_detail['site_id'];
+     $in_site = in_array ($node_site_id,$_person['site_ids']);
+     if( ! $in_site) {
+       $error= "Insufficient permission. You cannot create configuration files for this node.";
+     }
+   }
+
+   $hostname= $node_detail['hostname'];
+   $return= $api->GetNodeNetworks( array( "node_id" => $node_id ), NULL );
+   
+   $can_gen_config= 1;
+   $has_primary= 0;
+   
+   if( count($return) > 0 ) {
+     foreach( $return as $node_network_detail ) {
+       if( $node_network_detail['is_primary'] == true ) {
+	 $has_primary= 1;
+	 break;
+       }
+     }
+   }
+
+   if( !$has_primary ) {
+     $can_gen_config= 0;
+   } else {
+     if( $node_detail['hostname'] == "" ) {
+       $can_gen_config= 0;
+       $node_detail['hostname']= "Missing";
+     }
+     
+     $fields= array("method","ip");
+     foreach( $fields as $field ) {
+       if( $node_network_detail[$field] == "" ) {
+	 $can_gen_config= 0;
+	 $node_network_detail[$field]= "Missing";
+       }
+     }
+
+     if( $node_network_detail['method'] == "static" ) {
+       $fields= array("gateway","netmask","network","broadcast","dns1");
+       foreach( $fields as $field ) {
+	 if( $node_network_detail[$field] == "" ) {
+	   $can_gen_config= 0;
+	   $node_network_detail[$field]= "Missing";
+	 }
+       }
+     }
+
+     if(    $node_network_detail['method'] != "static" 
+	 && $node_network_detail['method'] != "dhcp" ) {
+       $can_gen_config= 0;
+       $node_network_detail['method']= "Unknown method";
+     }
+   }
+
+   $download= $_POST['download'];
+   
+   if( $can_gen_config && !empty($download) ) {
+     if (! method_exists ($api,"GetBootMedium")) {
+       $file_contents= $api->AdmGenerateNodeConfFile( $node_id );
+       header ("Content-Type: application/octet-stream");
+       header ("Content-Transfer-Encoding: binary");
+       header ("Content-Disposition: attachment; filename=plnode.txt" );
+       header ("Content-Length: " . strlen(file_contents));
+       header ("Pragma: hack");
+       header ("Cache-Control: public, must-revalidate");
+       print file_contents;
+       exit();
+     } else {
+       switch ($action) {
+       case 'download-node-floppy':
+	 $boot_action='node-floppy'; 
+	 $location = "%d/%n-%v-rename-into-plnode%s";
+	 break;
+       case 'download-node-iso':
+	 $boot_action='node-iso';
+	 $location = "%d/%n-%v%s";
+	 break;
+       case 'download-node-usb':
+	 $boot_action='node-usb';
+	 $location = "%d/%n-%v%s";
+	 break;
+       }	 
+
+       $filename=$api->GetBootMedium($node_id,$boot_action,$location);
+       $error=$api->error();
+       if (empty($error) && empty($filename)) {
+	 $error="Unexpected error from GetBootMedium - probably wrong directory modes";
+       }    
+       if (! empty($error)) {
+       	 print ("
                           $error 
                          \n");
+       	 print ("
                          Back to node \n");
+	 return ;
+       } else {
+	 deliver_and_unlink ($filename);
+	 exit();
+       }
+     }
+       
+   }
+
+   drupal_set_title("Download boot material for $hostname");
+
+   $header= <<In order to create a configuration file for this node using this page,
+all the node network settings must be up to date. Below is summary of these
+values. Any missing values must be entered before this can be used.
+
+EOF;
+
+   echo $header;
+
+   show_download_confirm_button($api, $node_id, $action, $can_gen_config, false);
+   print ("
                          ");
+   print ("
                          Current node network settings
                          \n");
+   
+if( $has_primary ) {
+  print( "\n" );
+  
+  print( "" );
+  print( "" );
+  print( "\n" );
+  print( "" );
+  print( "\n" );
+
+  $nn_id = $node_network_detail['nodenetwork_id'];
+  print( "" );
+
+  print( "" );
+  print( "\n" );
+  print( "" );
+  print( "\n" );
+
+  if( $node_network_detail['method'] == "static" ) {
+      print( "" );
+      print( "\n" );
+      print( "" );
+      print( "\n" );
+      print( "" );
+      print( "\n" );
+      print( "" );
+      print( "\n" );
+      print( "" );
+      print( "\n" );
+      print( "" );
+      if( $node_network_detail['dns2'] == "" ) {
+	print( "\n" );
+      } else {
+	print( "\n" );
+      }
+    }
+
+  if (method_exists ($api,'GetNodeNetworkSettings')) {
+    print ("\n");
+    $nn_id = $node_network_detail['nodenetwork_id'];
+    $settings=$api->GetNodeNetworkSettings(array("nodenetwork_id" => array($nn_id)));
+    foreach ($settings as $setting) {
+      $category=$setting['category'];
+      $name=$setting['name'];
+      $value=$setting['value'];
+      print (" \n");
+    }
+  }
+
+  print( "
                          Node Details
                          node_id:$node_id
                          Hostname:" . $node_detail['hostname'] . "
                          Node Network Details
                          Method:" . $node_network_detail['method'] . "
                          IP:" . $node_network_detail['ip'] . "
                          Gateway:" . $node_network_detail['gateway'] . "
                          Network mask:" . $node_network_detail['netmask'] . "
                          Network address:" . $node_network_detail['network'] . "
                          Broadcast address:" . $node_network_detail['broadcast'] . "
                          DNS 1:" . $node_network_detail['dns1'] . "
                          DNS 2:Optional, missing
                          " . $node_network_detail['dns2'] . "
                          Additional Settings
                           $category $name  $value 
                          \n" );
+} else {
+  print( "
                          This node has no configured primary network.
                          \n" );
+}
+
+ show_download_confirm_button($api, $node_id, $action, $can_gen_config, true);
+ break;
+ 
+ default:
+   echo "Unkown action <$action>.";
+   header("location:index.php?id=" . $node_id);
+   exit();
+   break;
+ }
+
+?>
diff --git a/planetlab/nodes/node_groups.php b/planetlab/nodes/node_groups.php
new file mode 100644
index 0000000..aad5f18
--- /dev/null
+++ b/planetlab/nodes/node_groups.php
@@ -0,0 +1,302 @@
+person;
+$_roles= $_person['role_ids'];
+
+
+// if sent here from another page remove then redirect
+if( $_GET['remove'] && $_GET['nodegroup_id'] ) {
+  $ng_id= $_GET['nodegroup_id'];
+  $node_id= $_GET['remove'];
+
+  $api->DeleteNodeFromNodeGroup( intval( $node_id ), intval( $ng_id ) );
+
+  header( "location: index.php?id=$node_id" );
+  exit();
+  
+}
+
+
+// Print header
+require_once 'plc_drupal.php'; 
+drupal_set_title('Node Groups');
+include 'plc_header.php';
+
+
+// if no id display list of nodegroups
+if( !$_GET['id'] && !$_GET['nodegroup_id'] ) {
+  $nodegroup_info= $api->GetNodeGroups( NULL, array( "nodegroup_id", "name", "description" ) );
+
+  echo "
                          Node Groups
                          \n
+	";
+
+   // if admin we need to more cells
+   if(  in_array( "10", $_person['role_ids'] ) )
+     echo "";
+   echo "";
+
+  foreach( $nodegroup_info as $type ) {
+    echo "";
+    // if admin display edit/delet links
+    if(  in_array( "10", $_person['role_ids'] ) ) {
+      echo "";
+      echo plc_delete_link_button('node_groups.php?del_type=' . $type['nodegroup_id'],
+				  $type['name']);
+      echo "";
+    }
+    echo "\n";
+
+  }
+
+  echo "
                          NameDescription
                          ". $type['name'] ."". $type['description'] ."Edit
                          \n";
+
+}
+// if id is set then show nodegroup info
+elseif( $_GET['id'] ) {
+  $nodegroup_id= $_GET['id'];
+
+  $nodegroup_info= $api->GetNodeGroups( array( intval( $nodegroup_id ) ), array( "name", "nodegroup_id", "node_ids" ) );
+  $node_info= $api->GetNodes( $nodegroup_info[0]['node_ids'], array( "node_id", "hostname" ) );
+
+  //display info 
+  echo "
                          Node Group ". $nodegroup_info[0]['name'] ."
                          \n";
+
+  if( empty( $nodegroup_info[0]['node_ids'] ) )
+    echo "
                          No nodes in node group.";
+  else {
+    echo "";
+
+    // if admin need more cells
+    if( in_array( 10, $_roles ) ) 
+      echo "";
+
+    echo "\n";
+
+    foreach( $node_info as $node ) {
+      echo "";
+
+      if( in_array( 10, $_roles ) )
+        echo "";
+
+      echo "";
+
+    }
+
+    echo "
                          HostnameRemove
                          ". $node['hostname'] ."remove
                          \n";
+
+  }
+
+}
+// if no id add else update
+elseif( $_GET['add'] ) {
+  // add node group and redirect to update nodes for it
+  if( $_POST['add_sub'] ) {
+    $name= $_POST['name'];
+    $description= $_POST['description'];
+
+    $fields= array( 'name'=>$name, 'description'=>$description );
+
+    // add it
+    $api->AddNodeGroup( $fields );
+
+    // get nodegroup_id
+    $group_info= $api->GetNodeGroups( array( $name ), array( "nodegroup_id" ) );
+
+    // redirect
+    header( "location: node_groups.php?id=". $group_info[0]['nodegroup_id'] );
+    exit();
+
+  }
+  
+  // add form
+  echo "
                          ";
+  echo "
                          Create Node Group
                          \n";
+  echo "\n";
+  echo "\n\n";
+  echo "
                          Name: 
                          Description: 
                          \n";
+
+  echo "
                          \nBack to Node Index\n";
+  
+}
+elseif( $_GET['nodegroup_id'] )
+{
+  // get node group id
+  $node_group_id= $_GET['nodegroup_id'];
+  
+  // if add node submitted, add
+  if( $_POST['add'] )
+  {
+    $add_nodes= $_POST['add_nodes'];
+
+    // add nodes to node group
+    foreach( $add_nodes as $add_node )
+    {
+      $api->AddNodeToNodeGroup( intval( $add_node ), intval( $node_group_id ) );
+
+    }
+    
+  }
+
+  // if remove node submitted, remove
+  if( $_POST['remove'] )
+  {
+    $rem_nodes= $_POST['rem_nodes'];
+
+    // remove nodes from node group
+    foreach( $rem_nodes as $rem_node )
+    {
+      $api->DeleteNodeFromNodeGroup( intval( $rem_node ), intval( $node_group_id ) );
+
+    }
+    
+  }
+
+  // update name and description
+  $name= $_POST['name'];
+  $description= $_POST['description'];
+
+  $fields= array();
+
+  if( $name )
+    $fields['name']= $name;
+
+  if( $description )
+    $fields['description']= $description;
+
+  // api call
+  if( !empty( $fields ) )
+    $api->UpdateNodeGroup( intval( $node_group_id ), $fields );
+
+  // get node_group info
+  $group_info= $api->GetNodeGroups( array( intval( $node_group_id ) ), array( "node_ids", "name", "conf_file_ids", "description" ) );
+
+  $node_ids = $group_info[0]['node_ids'];
+  $name = $group_info[0]['name'];
+  $conf_file_ids = $group_info[0]['conf_file_ids'];
+  $description = $group_info[0]['description'];
+
+  // get node info
+  if( !empty( $node_ids ) )
+    $node_info= $api->GetNodes( $node_ids, array( "hostname", "node_id" ) );
+
+  // get site names and ids
+  $site_info= $api->GetSites( NULL, array( "site_id", "name" ) );
+  sort_sites( $site_info );
+
+  // if site_id is in post use it, if not use the user's primary
+  if( $_POST['site_id'] )
+    $site_id= $_POST['site_id'];
+  else
+    $site_id= $_person['site_ids'][0];
+
+  // get site nodes for $site_id
+  $sid= intval( $site_id );
+  $site_node_info= $api->GetSites( array( $sid ), array( "node_ids" ) );
+  $site_nodes= $site_node_info[0]['node_ids'];
+
+
+  // gets all node_ids from site that arent already associated with the node group
+  foreach( $site_nodes as $snode) {
+    if( !in_array( $snode, $node_ids ) )
+      $snodes[]= $snode;
+
+  }
+
+  // Get node info from new list
+  if( !empty( $snodes ) )
+    $snode_info= $api->GetNodes( $snodes, array( "hostname", "node_id" ) );
+
+
+  // start form
+  echo "\n";
+  echo "
                          Update Node Group id $name
                          \n";
+
+  echo "Select a site to add nodes from.
                          \n";
+  echo "\n";
+
+  echo "
                          \n";
+
+  // show all availible nodes at $site_id
+  if( $snode_info ) {
+    echo $added;
+    echo "\n";
+    
+    foreach( $snode_info as $snodes ) {
+      echo "\n";
+    
+    }
+    
+    echo "
                            ". $snodes['hostname'] ." 
                          \n";
+    echo "
                          \n";
+
+  }
+  else
+    echo "
                          All nodes on site already added.\n";
+
+  echo "
                          \n";
+
+  // show all nodes currently associated
+  echo $removed;
+  echo "
                          Nodes already associated with node group
                          \n";
+  if( $node_info ) {
+    echo "Check boxes of nodes to remove:\n";
+    echo "\n";
+
+    foreach( $node_info as $node ) {
+      echo "\n";
+    
+    }
+    
+    echo "
                            ". $node['hostname'] ." 
                          \n";
+    echo "
                          \n";
+    
+  }
+  else
+    echo "
                          No nodes associated with node group.\n";
+
+  echo "
                          \n";
+
+  echo "\n";
+  echo "\n";
+  echo "\n";
+
+  echo "
                          Name: 
                          Description: 
                          \n";
+  echo "
                          \n";
+
+  echo "
                          \n";
+
+  echo "
                          Back to Node Group Index\n";
+
+
+}
+
+
+// Print footer
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/nodes/node_networks.php b/planetlab/nodes/node_networks.php
new file mode 100644
index 0000000..4b7ef71
--- /dev/null
+++ b/planetlab/nodes/node_networks.php
@@ -0,0 +1,245 @@
+person;
+$_roles= $_person['role_ids'];
+
+$nodenetwork = array();
+
+// If nodenetwork_id is specified, load data
+if( isset( $_GET['id'] ) ) {
+  $id= intval( $_GET['id'] );
+  $nodenetworks= $api->GetNodeNetworks( array( $id ) );
+  if( $nodenetworks ) {
+    $nodenetwork= $nodenetworks[0];
+    $node_id= $nodenetwork['node_id'];
+  }
+}
+
+if( $_GET['node_id'] ) 
+  $node_id= $_GET['node_id'];
+
+// Override fields with specified data
+foreach( array( 'method', 'type', 'ip', 'gateway', 'network', 'broadcast', 'netmask', 'dns1', 'dns2', 'hostname', 'mac', 'bwlimit', 'node_id' ) as $field ) {
+  if( isset( $_POST[$field] ) ) {
+    if( $_POST[$field] == "" ) {
+      $nodenetwork[$field]= NULL;
+    } else {
+      $nodenetwork[$field]= $_POST[$field];
+      if( in_array( $field, array( 'bwlimit', 'node_id' ) ) ) {
+	$nodenetwork[$field]= intval( $nodenetwork[$field] );
+      }
+    }
+  }
+  if( isset( $nodenetwork[$field] ) ) {
+    // E.g., $method = $nodenetwork['method'];
+    $$field= $nodenetwork[$field];
+  }
+}
+
+// Either nodenetwork_id or node_id must be specified in URL
+if( !isset( $_GET['node_id'] ) && !( $nodes= $api->GetNodes( array( intval($node_id) ), array( 'node_id', 'hostname', 'site_id' ) ) ) ) {
+  Header( "Location: index.php" );
+  exit();
+}
+
+
+$nodes= $api->GetNodes( array( intval($node_id) ), array( 'node_id', 'hostname', 'site_id' ) );
+$node= $nodes[0];
+
+$can_update= True;
+if( !in_array( 10, $_roles ) ) {
+  if ( !( in_array( 20, $_roles ) || in_array( 40, $_roles ) ) || !in_array( $node['site_id'], $_person['site_ids'] ) ) {
+    $can_update= False;
+  }
+}
+
+if( $can_update && (isset( $_POST['submitted'] ) || isset ($_GET['submitted'])) ) {
+  if( isset( $_POST['add'] ) ) {
+    $api->AddNodeNetwork( intval( $node_id ), $nodenetwork );
+  }
+  elseif ( isset( $_POST['delete'] ) || isset( $_GET['delete']) || isset( $_POST['update'] ) ) {
+    // nodenetwork_id must be specified in URL
+    if( !isset( $id ) ) {
+      Header( "Location: index.php?id=$node_id" );
+      exit();
+    }
+    if( isset( $_POST['delete'] ) || isset ($_GET['delete']) ) {
+      $api->DeleteNodeNetwork( $id );
+    }
+    elseif( isset( $_POST['update'] ) ) {
+      $api->UpdateNodeNetwork( $id, $nodenetwork );
+    }
+  }
+
+  $error= $api->error();
+
+  if( !empty( $error ) ) {
+    echo '
                          ' . $error . '.
                          ';
+  } else {
+    Header( "Location: index.php?id=$node_id" );
+    exit();
+  }
+  
+}
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title($node['hostname']);
+include 'plc_header.php';
+
+// Start form
+$action= "node_networks.php";
+if( isset( $id ) ) {
+  $action.= "?id=" . $nodenetwork['nodenetwork_id'];
+} 
+elseif( isset($node_id)) {
+  $action.= "?node_id=" . $node_id;
+}
+
+foreach( array( 'static', 'dhcp', 'proxy', 'tap', 'ipmi' ) as $option ) {
+  ${$option . "_selected"} = ( $method == $option ) ? 'selected="selected"' : '';
+}
+
+// XXX Query methods and types
+echo <<
+function updateStaticFields()
+{
+  var is_static= document.fm.method.options[document.fm.method.selectedIndex].text == 'Static';
+  var is_tap= document.fm.method.options[document.fm.method.selectedIndex].text == 'TUN/TAP';
+
+  document.fm.netmask.disabled= !is_static;
+  document.fm.network.disabled= !is_static;
+  document.fm.gateway.disabled= !is_static && !is_tap;
+  document.fm.broadcast.disabled= !is_static;
+  document.fm.dns1.disabled= !is_static;
+  document.fm.dns2.disabled= !is_static;
+}
+
+
+
                          
+
+
+
+
+  
+  
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+EOF;
+
+if ($can_update) {
+  echo '';
+}
+
+echo <<
+
                          Method: 
+    
+  
                          Type: 
+    
+  
                          IP: 
                          BW Limit:  
                           
                           
                          Gateway:  
                          Network:  
                          Broadcast:  
                          Netmask:  
                          DNS 1:  
                          DNS 2:  
                          Hostname:  
                          MAC Address:  
                          BW Limit (bps):  
                          ';
+  echo '';
+  if (isset($id)) {
+    echo '';
+    echo '';
+  }
+  echo '';
+  echo '
                          
+
                          
+EOF;
+
+// displays related settings, if supported by the API
+if (method_exists ($api,'GetNodeNetworkSettings')) {
+
+  $is_admin=in_array( 10, $_roles );
+  $is_pi=in_array( 20, $_roles );
+  print "
                          ";
+
+  if (empty ($nodenetwork['nodenetwork_setting_ids'])) {
+    print "
                           This network interface has no additional setting
                          ";
+    if( $is_admin || $is_pi )
+      echo "
                          Add a Network Setting
                          \n";
+  } else {
+    $nodenetwork_settings = $api->GetNodeNetworkSettings($nodenetwork['nodenetwork_setting_ids']);
+    sort_nodenetwork_settings ($nodenetwork_settings);
+    print "";
+    print "";
+    // the column for the delete button
+    if( $is_admin )
+      print "";
+    print "";
+    foreach ($nodenetwork_settings as $setting) {
+      echo "";
+      if ($is_admin) {
+	echo("");
+    }
+      if ($is_admin || $is_pi) 
+	printf ("",$setting['nodenetwork_setting_id'],$setting['name']);
+      else
+	printf ("",$setting['name']);
+      printf ("",
+	      $setting['category'],
+	      $setting['description'],
+	      $setting['value']);
+    }
+    if( $is_admin || $is_pi )
+      echo "
                          Additional Settings
                          NameCategoryDescriptionValue
                          ");
+	echo plc_delete_link_button('setting_action.php?rem_id=' . $setting['nodenetwork_setting_id'],
+				    '\\n [ ' . $setting['name'] . ' = ' . $setting['value']);
+	echo(" %s  %s  %s %s %s 
                          Add a Network Setting\n";
+    
+    print "
                          ";
+  }
+ }
+
+echo <<Back to Node
+
+EOF;
+
+// Print footer
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/nodes/production_hosts.php b/planetlab/nodes/production_hosts.php
new file mode 100644
index 0000000..e384416
--- /dev/null
+++ b/planetlab/nodes/production_hosts.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/production_ips.php b/planetlab/nodes/production_ips.php
new file mode 100644
index 0000000..e5ee49e
--- /dev/null
+++ b/planetlab/nodes/production_ips.php
@@ -0,0 +1,5 @@
+
diff --git a/planetlab/nodes/setting_action.php b/planetlab/nodes/setting_action.php
new file mode 100644
index 0000000..3522148
--- /dev/null
+++ b/planetlab/nodes/setting_action.php
@@ -0,0 +1,131 @@
+person;
+$_roles= $_person['role_ids'];
+
+//plc_debug('GET',$_GET);
+//plc_debug('POST',$_POST);
+
+// attribute type updates
+if( $_POST['edit_type'] ) {
+  $setting_type_id= intval( $_POST['nodenetwork_setting_type_id'] );
+  $setting_type = array ('category' => $_POST['category'],
+			 'name' => $_POST['name'],
+			 'min_role_id' => intval( $_POST['min_role_id'] ),
+			 'description' => $_POST['description']);
+  
+  // Update it!
+  $api->UpdateNodeNetworkSettingType( $setting_type_id, $setting_type );
+  $api_error=$api->error();
+  if (!empty($api_error)) {
+    print "
                          " . $api_error . "
                          ";
+  }
+  
+  header( "location: settings.php" );
+  exit();
+}
+
+// attribute type adds
+if( $_POST['add_type'] ) {
+  $setting_type = array ('category' => $_POST['category'],
+			 'name' => $_POST['name'],
+			 'min_role_id' => intval( $_POST['min_role_id'] ),
+			 'description' => $_POST['description']);
+  // add it!!
+  $api->AddNodeNetworkSettingType( $setting_type );
+
+  header( "location: settings.php" );
+  exit();
+}
+  
+
+// attribute deletion
+if( $_GET['rem_id'] ) {
+  // get the id of the attrib to remove from GET
+  $setting_id= intval( $_GET['rem_id'] );
+
+  // get nodenetwork_id 
+  $setting= $api->GetNodeNetworkSettings( array( $setting_id ), array( "nodenetwork_id" ) );
+  $nodenetwork_id= $setting[0]['nodenetwork_id'];
+  
+  // delete the attribute
+  $api->DeleteNodeNetworkSetting( $setting_id );
+
+  header( "location: node_networks.php?id=$nodenetwork_id" );
+  exit();
+}
+
+// attribute adds
+if( $_POST['add_setting'] ) {
+  // get the nodenetwork_id, attribute_type_id, and value from POST
+  $nodenetwork_id= intval( $_POST['nodenetwork_id'] );
+  $nodenetwork_setting_type_id= intval( $_POST['nodenetwork_setting_type_id'] );
+  $value= $_POST['value'];
+
+  // add it!
+  $api->AddNodeNetworkSetting( $nodenetwork_id, $nodenetwork_setting_type_id, $value );
+
+  header( "location: node_networks.php?id=$nodenetwork_id" );
+  exit();
+}
+
+// attribute updates
+if( $_POST['edit_setting'] ) {
+  // get the id of the setting to update and the value from POST
+  $setting_id= intval( $_POST['setting_id'] );
+  $value= $_POST['value'];
+  $nodenetwork_id= $_POST['nodenetwork_id'];
+
+  // update it!
+  $api->UpdateNodeNetworkSetting($setting_id, $value );
+
+  header( "location: node_networks.php?id=$nodenetwork_id" );
+  exit();
+}
+
+// down here is some codqe from attrib_action.php that was not converted yet
+// Settings -------------------------------------------------
+
+// ATTRIBUTE TYPES ---------------------------------------------------
+  
+// delete attribute types
+if( $_GET['del_type'] ) {
+  // get vars
+  $type_id= intval( $_GET['del_type'] );
+
+  // delete it!
+  $api->DeleteNodeNetworkSettingType( $type_id );
+  
+  header( "location: settings.php" );
+  exit();
+}
+
+  
+  
+/*
+// Print footer
+include 'plc_footer.php';
+*/
+
+?>
diff --git a/planetlab/nodes/settings.php b/planetlab/nodes/settings.php
new file mode 100644
index 0000000..4d6c76a
--- /dev/null
+++ b/planetlab/nodes/settings.php
@@ -0,0 +1,234 @@
+person;
+$_roles= $_person['role_ids'];
+
+//plc_debug("person", $_person );
+
+$columns=array( "nodenetwork_setting_type_id", "category", "name", "description", "min_role_id" );
+
+// prepare dict role_id => role_name
+global $roles;
+$roles= $api->GetRoles();
+global $roles_id_to_name;
+$roles_id_to_name=array();
+foreach ($roles as $role) {
+  $roles_id_to_name[$role['role_id']] = $role['name'];
+}
+
+// compute person's smallest role
+global $person_role;
+$person_role=50;
+foreach ($_person['role_ids'] as $role_id) {
+  if ($role_id < $person_role) {
+    $person_role=$role_id;
+  }
+}
+//plc_debug("person_role",$person_role);
+
+// post-process results from GetNodeNetworkSettingTypes
+// with planetlab 4.2, we've moved to php-5.2
+// with the former 5.0 reelase, I could invoke array_map 
+// with a function that took a reference and could do side-effects
+// Now I have to return the copy...
+// this new way of doing things might require more memory
+// on the other hand we should move to a schema where 
+// pagination is done in the API, so it's no big deal hopefully
+function layout_setting_type ($setting_type) {
+  // replace role_id with name
+  global $roles_id_to_name;
+  $setting_type['min_role']=$roles_id_to_name[$setting_type['min_role_id']];
+  return $setting_type;
+}
+
+// if no id, display list of attributes types
+if( !$_GET['id'] && !$_GET['add'] && !$_GET['add_type'] && !$_GET['edit_type'] ) {
+  // get types
+  global $person_role;
+  $filter = array (']min_role_id'=>$person_role);
+  $setting_types= $api->GetNodeNetworkSettingTypes( $filter, $columns );
+  $setting_types = array_map(layout_setting_type,$setting_types);
+  sort_nodenetwork_settings ($setting_types);
+  
+  // list them
+  
+  echo "";
+  echo "";
+  // if admin we need one more cells for delete links
+  if(  in_array( "10", $_person['role_ids'] ) )
+    echo "";
+  $role_header="
                          min
                          Role
                          ";
+  echo "Name";
+  echo "Category";
+  echo "" . $role_header . "";
+  echo "Id";
+  echo "Description";
+  echo "";
+  echo "";
+
+  foreach( $setting_types as $type ) {
+    echo "";
+    // if admin display delete links
+    if(  in_array( "10", $_person['role_ids'] ) ) {
+      echo "";
+      echo plc_delete_link_button('setting_action.php?del_type='. $type['nodenetwork_setting_type_id'],
+				  $type['name']);
+      echo "";
+    }
+    // if admin, the name is a link to edition
+    if (in_array( "10", $_person['role_ids'])) {
+      echo "" . $type['name'] . "";
+    } else {
+      echo "" . $type['name'] . "";
+    }
+    echo "" . $type['category'] . "";
+    echo "" . $type['min_role'] . "" . $type['min_role_id'] . "" . $type['description'] . "";
+    echo "\n";
+  }
+  
+  if( in_array( "10", $_person['role_ids'] ) )
+    echo "Add a Setting Type";
+
+  echo "\n";
+  
+  
+  // back link o nodes
+  echo "
                          Back to Nodes\n";
+
+}
+elseif( $_GET['add_type'] || $_GET['edit_type'] ) {
+  // if its edit get the attribute info
+  if( $_GET['edit_type'] ) {
+    $type_id= intval( $_GET['edit_type'] );
+    $type= $api->GetNodeNetworkSettingTypes( array( $type_id ) );
+    
+    $category=$type[0]['category'];
+    $name= $type[0]['name'];
+    $min_role_id= $type[0]['min_role_id'];
+    $description= $type[0]['description'];
+    
+  }
+  
+  // display form for setting types
+  echo "
                          \n";
+  if ($_GET['edit_type']) {
+    drupal_set_title("Edit Setting Type");
+  } else {
+    drupal_set_title("Add Setting Type");
+  }
+  echo "";
+  echo "\n";
+  echo "\n";
+  echo "\n";
+  echo "\n";
+  echo "";
+  echo "
                          Category:
                          Name:
                          Min Role:
                          Description:";
+  echo "\n";
+  echo "
                          ";
+  if( $_GET['edit_type'] ) {
+    echo "\n";
+    echo "\n";
+  } else {
+    echo "\n";
+  }
+  echo "
                          ";
+
+  echo "
                          \n";
+
+  echo "
                          Back to Setting Types\n";
+}
+elseif( $_GET['add'] ) {
+
+  // get nodenetwork id from GET
+  $nodenetwork_id= intval( $_GET['add'] );
+  
+  // get all setting types 
+  global $person_role;
+  $filter = array (']min_role_id'=>$person_role);
+  $setting_types= $api->GetNodeNetworkSettingTypes( $filter, array( "nodenetwork_setting_type_id", "name" , "category") );
+  sort_nodenetwork_settings($setting_types);
+    
+  // get nodenetwork's settings
+  $nodenetwork = $api->GetNodeNetworks( array( $nodenetwork_id ), array( "nodenetwork_setting_ids","ip" ) );
+  
+  drupal_set_title("Add a setting to  ". $nodenetwork[0]['ip']);
+
+  // start form
+  echo "
                          \n";
+  echo "\n";
+  
+  echo "";
+
+  echo "\n";
+  
+  echo "\n";
+  echo "
                            New Setting 
                          Select\n";
+  
+  echo "
                          Value: 
                          ";
+  echo "
                          \n";
+
+}
+else {
+  $setting_id= intval( $_GET['id'] );
+  
+  // get setting info
+  $setting= $api->GetNodeNetworkSettings( array( $setting_id ));
+  
+  // nodenetwork info
+  $nodenetwork= $api->GetNodeNetworks( array( $setting[0]['nodenetwork_id'] ), array( "ip" ) );
+  
+  drupal_set_title("Edit setting ". $setting[0]['name'] ." on ". $nodenetwork[0]['ip']);
+
+  // start form and put values in to be edited.
+  echo "
                          \n";
+  echo "\n";
+  echo "\n";
+  
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "
                            Edit Setting 
                           Category  " . $setting[0]['category'] . "
                           Name  " . $setting[0]['name'] . "
                           Value   
                           
                          ";
+  echo "
                          \n";
+  
+}
+
+// back link is case-dependant
+
+// Print footer
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/nodes/sliver_action.php b/planetlab/nodes/sliver_action.php
new file mode 100644
index 0000000..0817d3c
--- /dev/null
+++ b/planetlab/nodes/sliver_action.php
@@ -0,0 +1,60 @@
+person;
+$_roles= $_person['role_ids'];
+
+
+if( !empty( $_POST['add_sub'] ) ) {
+  $attrib_type= $_POST['sliver'];
+  $value= $_POST['value'];
+  $node_id= $_POST['node_id'];
+  $slice_id= $_POST['slice_id'];
+
+  $api->AddSliceAttribute( intval( $slice_id ), intval( $attrib_type ), $value, intval( $node_id ) );
+
+  header( "location: slivers.php?slice=$slice_id&node=$node_id" );
+  exit();
+  
+}
+
+
+// 
+if( $_GET['rem_id'] ) {
+  $attrib_id= $_GET['rem_id'];
+  
+  // get the slivers for this node
+  $sliver_info= $api->GetSliceAttributes( array( "slice_attribute_id"=>intval( $attrib_id ) ), array( "slice_id", "node_id" ) );
+  
+  $api->DeleteSliceAttribute( intval( $attrib_id ) );
+
+  header( "location: slivers.php?slice=". $sliver_info[0]['slice_id'] ."&node=". $sliver_info[0]['node_id'] );
+  exit();
+  
+}
+
+  
+/*
+// Print footer
+include 'plc_footer.php';
+*/
+
+?>
diff --git a/planetlab/nodes/slivers.php b/planetlab/nodes/slivers.php
new file mode 100644
index 0000000..cca34a7
--- /dev/null
+++ b/planetlab/nodes/slivers.php
@@ -0,0 +1,144 @@
+person;
+$_roles= $_person['role_ids'];
+
+//print_r( $_person );
+
+
+// if add is set, diplay add sliver form
+if( $_GET['add'] ) {
+  $node_id= $_GET['add'];
+  $slice_id= $_GET['slice'];
+
+  // slice info
+  $slice_info= $api->GetSlices( array( intval( $slice_id ) ), array( "name" ) );
+
+  // node info
+  $node_info= $api->GetNodes( array( intval( $node_id ) ), array( "hostname" ) );
+
+  // get attribute types
+  $type_info= $api->GetSliceAttributeTypes( NULL, array( "attribute_type_id", "name" ) );
+  
+  // get the slivers for this node
+  $sliver_info= $api->GetSliceAttributes( array( "node_id"=>intval( $node_id ), "slice_id"=>intval( $slice_id ) ), array( "attribute_type_id", "name" ) );
+
+    $types_left= $type_info;
+
+
+  // start form
+  echo "
                          \n
+  
                          Add a Sliver Attribute to ". $slice_info[0]['name'] ." on node ". $node_info[0]['hostname'] ."
                          \n
+  \n
+  \n
+  \n
+  
                          Attribute: 
                          Value: 
                          \n
+  
+  
                          \n";
+
+  echo "
                          Back to Node\n
                          \n";
+  
+}
+
+
+// if slice and node ids are passed display slivers and attribs
+if( $_GET['slice'] && $_GET['node'] ) {
+  $slice_id= $_GET['slice'];
+  $node_id= $_GET['node'];
+
+  // slice info
+  $slice_info= $api->GetSlices( array( intval( $slice_id ) ), array( "name" ) );
+
+  // node info
+  $node_info= $api->GetNodes( array( intval( $node_id ) ), array( "hostname" ) );
+
+  // get the slivers for this node
+  $sliver_info= $api->GetSliceAttributes( array( "node_id"=>intval( $node_id ), "slice_id"=>intval( $slice_id ) ), array( "slice_attribute_id", "name", "value", "min_role_id", "description" ) );
+
+  // get the attrbibutes for this slice
+  $attrib_info= $api->GetSliceAttributes( array( intval( $slice_id ) ), array( "slice_attribute_id", "name", "value", "min_role_id", "description" ) );
+
+
+  // start form
+  echo "
                          \n
                          Sliver Details for slice ". $slice_info[0]['name'] ." on node ". $node_info[0]['hostname'] ."
                          \n";
+
+  // sliver attributes of slice
+  if( empty( $sliver_info ) )
+    // if no sliver exists tell user
+    echo "No sliver attribute for this node/slice sliver combination.\n";
+  else {
+    echo "
                          \n\n";
+    if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "";
+    echo "\n";
+
+    foreach( $sliver_info AS $sliver ) {
+      echo "";
+      if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "";
+      echo "\n";
+
+
+    }
+
+    echo "
                          Slivers
                          NameValueMin RollDescription
                          ". $sliver['name'] ."". $sliver['value'] ."". $sliver['min_role_id'] ."". $sliver['description'] ."EditRemove
                          \n";
+
+  }
+  
+  if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "
                          Add Sliver Attribute\n";
+
+  echo "
                          ";
+
+  // regular attributes of slice
+  if( empty( $attrib_info ) )
+    // if no attributes exist tell user
+    echo "No Attributes for this slice.\n";
+  else {
+    echo "
                          \n\n";
+    if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "";
+    echo "\n";
+
+    foreach( $attrib_info AS $attrib ) {
+      echo "";
+      if ( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $node_info, $_person['site_ids'] ) ) ) echo "";
+      echo "\n";
+
+
+    }
+
+    echo "
                          Attributes
                          NameValueMin RollDescription
                          ". $attrib['name'] ."". $attrib['value'] ."". $attrib['min_role_id'] ."". $attrib['description'] ."Edit
                          \n";
+
+  }
+
+
+  echo "
                          Back to Node\n
                          \n";
+
+}
+
+
+// Print footer
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/nodes/test.php b/planetlab/nodes/test.php
new file mode 100644
index 0000000..8d6ca59
--- /dev/null
+++ b/planetlab/nodes/test.php
@@ -0,0 +1,39 @@
+GetNodes( array( "hostname" => $input ), array("hostname") );
+  if (count($nodes)) {
+    foreach ( $nodes as $node ) {
+      $aResults[] = $node['hostname'];
+    }
+  }
+}
+
+header("Content-Type: text/xml");
+
+echo "
+";
+for ($i=0;$i".$aResults[$i]."";
+
+echo "
+
+";
+
+?>
diff --git a/planetlab/peers/index.php b/planetlab/peers/index.php
new file mode 100644
index 0000000..6261fed
--- /dev/null
+++ b/planetlab/peers/index.php
@@ -0,0 +1,108 @@
+person;
+$_roles= $_person['role_ids'];
+
+// layout : add a comon link
+function layout_peer ($peer) {
+  $peer['comon'] = plc_comon_button("peer_id",$peer['peer_id']);
+  return $peer;
+}
+
+
+// if peer_host is set then set id to that peer's id.
+if( $_POST['peername'] ) {
+  $peername= $_POST['peername'];
+
+  $peer_info= $api->GetPeers( array( $peername ), array( "peer_id" ) );
+
+  header( "location: index.php?id=". $peer_info[0]['peer_id'] );
+  exit();
+
+}
+
+if( !$_GET['id'] ) {
+
+  // GetPeers API call
+  $peers = $api->GetPeers( NULL, array("peer_id","peername","peer_url"));
+    
+  $local_peer_comon = plc_comon_button("peer_id","0");
+  echo "
                           See all local nodes through comon " . $local_peer_comon . " 
                          ";
+
+  if ( empty($peers)) {
+    echo "No known peer - standalone deployment";
+  } else {
+
+    $peers = array_map(layout_peer,$peers);
+    sort_peers( $peers );
+
+    echo "
                          ";
+    // xxx Thierry : mimicking what was done for nodes - not sure that makes sense here
+    if( $peername )
+      echo " $peername is not a valid peer.\n";
+
+    echo paginate( $peers, "peer_id", "Peers", 10, "peername" );
+  }
+
+} else {
+  // get the peer id from the URL
+  $peer_id= intval( $_GET['id'] );
+
+  // make the api call to pull that peers DATA
+  $peer_info= $api->GetPeers( array( $peer_id ) );
+
+  // peer info
+  $peername= $peer_info[0]['peername'];
+  $peer_url= $peer_info[0]['peer_url'];
+  // arrays of ids of peer info
+  $number_nodes= sizeof($peer_info[0]['node_ids']);
+  $number_slices= sizeof($peer_info[0]['slice_ids']);
+  $number_persons= sizeof($peer_info[0]['person_ids']);
+  $number_sites= sizeof($peer_info[0]['site_ids']);
+
+  // get peer id
+  $peer_id= $peer_info[0]['peer_id'];
+
+  drupal_set_title("Details for Peer " . $peername);
+
+  echo "\n";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "";
+  echo "
                          Peer name  $peername 
                          API url  $peer_url 
                           # nodes  $number_nodes 
                           # slices  $number_slices 
                           # sites  $number_sites 
                           # persons  $number_persons 
                          \n";
+}
+
+echo "
                          Back to peer list";
+echo "
                          ";
+
+
+// Print footer
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/persons/index.php b/planetlab/persons/index.php
new file mode 100644
index 0000000..783f311
--- /dev/null
+++ b/planetlab/persons/index.php
@@ -0,0 +1,473 @@
+person;
+$_roles= $_person['role_ids'];
+
+
+////////////////////
+// The set of columns to fetch
+// and the filter applied for fetching sites
+if ( !in_array( '10', $_roles ) ) {
+  $columns = array("person_id", "first_name", "last_name", "email", "roles" , "peer_id");
+  // PIs can see users not yet enabled
+  if ( ! in_array ('20', $_roles) ) {
+    $filter = array ("enabled" => TRUE);
+  } else {
+    $filter = array();
+  }
+ } else {
+  $columns = array("person_id", "first_name", "last_name", "email", "roles" , "peer_id", "key_ids", "enabled","slice_ids" );
+  $filter = array ();
+ }
+
+//////////////////
+// perform post-processing on site objects as returned by GetSites
+// performs sanity check and summarize the result in a single column
+// performs in-place replacement, so passes a reference
+function layout_person ($person) {
+
+  // we need the 'key_ids' field to do this
+  // so regular users wont run this
+  if ( ! array_key_exists ('key_ids', $person))
+    return $person ;
+    
+  $messages=array();
+  
+  // do all this stuff on local persons only
+  if ( $person['peer_id'] ) {
+    $class='plc-foreign';
+  } else {
+    $class='plc-warning';
+    // check that the person has keys, but dont do that for admins
+    if ( ! in_array ('admin',$person['roles']) && count($person['key_ids']) == 0)
+      $messages [] = "No Key";
+  }
+  if ( ! $person['enabled'] ) 
+    $messages[] = "Disabled";
+  // but always cleanup $person columns
+  unset ($person['key_ids']);
+  unset ($person['enabled']);
+  //detect tech already involved on some slices. 
+  if( ( count($person['roles'])==1 ) && ( in_array('tech',$person['roles']) )  && (! empty($person["slice_ids"])) ) {
+    $messages[]="Tech involved in a Slice";  
+  }
+  // cleanup $person columns
+  unset ($person['slice_ids']);
+  //display the extra status column
+  $person['status'] = plc_make_table($class,$messages);
+  return $person;
+}
+
+// if emailpattern or peerscope is set then search for Persons.
+// we use GET rather than POST so paginate can display the right contents on subsequent pages
+// can be useful for writing bookmarkable URL's as well
+if( $_GET['emailpattern'] || $_GET['peerscope']) {
+  $emailpattern= $_GET['emailpattern'];
+   if (empty($emailpattern)) { 
+    $emailpattern="*";
+  }
+   $filter = array_merge (array( "email"=>$emailpattern ), $filter);
+   switch ($_GET['peerscope']) {
+   case '':
+     $peer_label="all peers";
+     break;
+   case 'local':
+     $filter=array_merge(array("peer_id"=>NULL),$filter);
+     $peer_label="local peer";
+     break;
+   case 'foreign':
+     $filter=array_merge(array("~peer_id"=>NULL),$filter);
+     $peer_label="foreign peers";
+     break;
+   default:
+    $peer_id=intval($_GET['peerscope']);
+    $filter=array_merge(array("peer_id"=>$peer_id),$filter);
+    $peer=$api->GetPeers(array("peer_id"=>$peer_id));
+    $peer_label='peer "' . $peer[0]['peername'] . '"';
+    break;
+   }
+   // need to use a hash filter for patterns to be properly handled
+  $persons= $api->GetPersons($filter , $columns );
+  $persons= array_map(layout_person,$persons);
+  $person_count = count ($persons);
+  if ( $person_count == 1) {
+    header( "location: index.php?id=". $persons[0]['person_id'] );
+    exit();
+  } else if ( $person_count == 0) {
+    echo " No person whose email matches $emailpattern ";
+  } else {
+    drupal_set_title ("Users matching $emailpattern on ". $peer_label);
+    sort_persons ($persons);
+    echo paginate( $persons, "person_id", "Persons", 25, "email");
+  }
+ }
+// if a site_id is given, display the site persons only
+else if( $_GET['site_id'] ) {
+  $site_id= $_GET['site_id'];
+  // Get site info
+  $site_info= $api->GetSites( array( intval( $site_id ) ), array( "name", "person_ids" ) );
+  drupal_set_title("People with " . $site_info[0]['name']);
+  // Get site nodes
+  $persons= $api->GetPersons( array_merge (array("person_id"=>$site_info[0]['person_ids']),$filter), $columns );
+  $persons= array_map(layout_person,$persons);
+  sort_persons( $persons );
+
+  echo paginate( $persons, "person_id", "Persons", 25, "email" );
+
+}
+// if a slice_id is given,display the persons involved in this slice
+else if( $_GET['slice_id'] ) {
+  $slice_id= $_GET['slice_id'];
+  // Get slice infos
+  $slice_info= $api->GetSlices( array( intval( $slice_id ) ), array( "name", "person_ids" ) );
+  drupal_set_title("People In " . $slice_info[0]['name']);
+  // Get slice persons
+  $persons= $api->GetPersons( array_merge (array("person_id"=>$slice_info[0]['person_ids']),$filter), $columns );
+  if ( empty ($persons) ) {
+    echo "No persons to display";
+  } else {
+
+  $persons= array_map(layout_person,$persons);
+  sort_persons( $persons );
+
+  echo paginate( $persons, "person_id", "Persons", 25, "email" );
+  echo "
                          GetPersons( empty($filter) ? NULL : $filter, $columns );
+  $persons= array_map(layout_person,$persons);
+  sort_persons( $persons );
+
+  drupal_set_html_head('
+    
+    ');
+
+  echo "
                          \n
+
                          \n";
+  echo paginate( $persons, "person_id" , "Persons", 25, "email");
+  echo "\n";
+}
+else {
+  // get the person_id from the URL
+  $person_id= intval( $_GET['id'] );
+  // GetPersons API call for this person
+  $person_info= $api->GetPersons( array( $person_id ) );
+  if( empty( $person_info ) ) {
+    echo "No such person.";   
+  } else {
+    // vars from api
+    $first_name= $person_info[0]['first_name'];
+    $last_name= $person_info[0]['last_name'];
+    $title= $person_info[0]['title'];
+    $url= $person_info[0]['url'];
+    $phone= $person_info[0]['phone'];
+    $email= $person_info[0]['email'];
+    $enabled= $person_info[0]['enabled'];
+    $peer_id=$person_info[0]['peer_id'];
+    
+    // arrays from api
+    $role_ids= $person_info[0]['role_ids'];
+    $roles= $person_info[0]['roles'];
+    $site_ids= $person_info[0]['site_ids'];
+    $slice_ids= $person_info[0]['slice_ids'];
+    $key_ids= $person_info[0]['key_ids'];
+    
+    // gets more data from API calls
+    $site_info= $api->GetSites( $site_ids, array( "site_id", "name" ) );
+    $slice_info= $api->GetSlices( $slice_ids, array( "slice_id", "name" ) );
+    $key_info= $api->GetKeys( $key_ids );
+    
+    drupal_set_title("$first_name $last_name Account Information");
+
+    // start form
+    if ( ! $peer_id ) {
+      echo "
                          \n";
+    } else {
+      echo "
                          ";
+    }
+    echo "\n";
+    
+    if ( ! $peer_id ) {
+      if( in_array( 10, $_roles ) || ( in_array( 20, $_roles ) && in_array( $site_ids[0], $_person['site_ids'] ) ) ) {
+	// list to take person action
+
+	echo "
                          ";
+
+	if (in_array( 10, $_roles )) {
+	  echo plc_event_button("Person","person",$person_id); 
+	  echo "";
+	}
+
+	echo "\n";
+
+	if( $enabled == false ) {
+	  echo "";
+	  echo "   <- This user is not enabled. Choose here to enable or delete.";
+	}
+	echo "
                          ";
+      }
+
+    } 
+	
+    // basic person info
+    echo "
                          ";
+    echo "\n";
+    echo "\n";
+    echo "\n";
+    echo "\n";
+    echo "\n";
+    echo "\n";
+    echo "\n";
+    echo "
                          First Name:  $first_name
                          Last Name:  $last_name
                          Title:  $title
                          Email: $email
                          Phone: $phone
                          URL: $url
                          \n";
+	  
+    if( in_array( 10, $_roles ) || $_person['person_id'] == $person_id )
+      echo "
                          Update info\n";
+	  
+    echo "
                          \n";
+		
+    // keys
+    $can_manage_keys = ( ( ! $peer_id ) && (in_array( "10", $_roles ) || $person_id == $_person['person_id']));
+    echo "
                          Keys
                          \n";
+    if( !empty( $key_ids ) ) {
+      echo "
                          \n";
+      echo "";
+      if ( $can_manage_keys )
+	echo "";
+      echo "\n";
+			
+      foreach( $key_info as $key ) {
+	$key_type= $key['key_type'];
+	$key_id= $key['key_id'];
+	$key_text= wordwrap( $key['key'], 70, "
                          \n", 1 );
+	echo "\n";
+      }
+	
+      echo "
                          TypeKeyRemove
                          $key_type$key_text";
+	      
+	if ( $can_manage_keys ) 
+	  echo "";
+	      
+	echo "
                          \n";
+      if ($can_manage_keys)
+	echo "

                          \n";
+	    
+    } else {
+      echo " This user has no known key";
+    }
+		
+    if( $can_manage_keys ){
+      echo "
                           Upload new key: \n
+        \n
+        
                          \n";
+    }
+    // sites
+    echo "
                          Sites
                          \n";
+    if( !empty( $site_info ) ) {
+      echo "\n";
+	
+      foreach( $site_info as $site ) {
+	$site_name= $site['name'];
+	$site_id= $site['site_id'];
+	      
+	echo "\n";
+      }
+      echo "
                          $site_name  ( remove)
                          \n";
+      echo "\n";
+	
+    } else {
+      echo " This user is not affiliated with a site !!";
+    }
+	
+    // diplay site select list to add another site for user
+    if( ! $peer_id && in_array( 10, $_roles ) ) {
+      // get site info
+      $full_site_info= $api->GetSites( NULL, array( "site_id", "name" ) );
+	    
+      if( $site_info )
+	$person_site= arr_diff( $full_site_info, $site_info );
+      else
+	$person_site= $full_site_info;
+	    
+      sort_sites( $person_site );
+	    
+      echo "
                          Select a site to add this user to: ";
+      echo "";
+	    
+    }
+    echo "
                          \n";
+
+  // roles
+    echo "
                          Roles
                          \n";
+    echo "
                          \n";
+    echo "";
+    if( in_array( "10", $_roles ) )
+      echo "";
+    echo "\n";
+	  
+    // construct role array
+    for( $n=0; $n$role_ids[$n], 'name'=>$roles[$n] );
+    }
+    
+    $button_shown=0;
+    if ( !empty ($roles) ) {
+      foreach( $proles as $role ) {
+	$role_name= $role['name'];
+	$role_id= $role['role_id'];
+	      
+	echo "\n";
+	    $button_shown=1;
+	  }
+	}
+	      
+	echo "\n";
+      }
+    } else {
+      echo " This user has no known role !!";
+    }
+    echo "
                          RoleRemove
                          $role_name";
+	      
+
+	if( in_array( 10, $_roles ) ) {
+	  echo "";
+	  if ( ! $button_shown ) {
+	    $rowspan=count($roles);
+	    echo "
                          \n";
+	  
+    // if admin show roles to add
+    if( in_array( 10, $_roles ) ) {
+      $all_roles= $api->GetRoles();
+      $addable_roles= arr_diff( $all_roles, $proles );
+      ##when the proles array is empty strangely the method arr_diff($all_roles, $proles )
+      ##return an empty array and the scrolling roles list is not displayed in this case
+      ##assign to addablerole all the roles
+      if (count($proles)==0)
+	$addable_roles=$all_roles;
+      
+      if( !empty( $addable_roles ) ) {
+	echo "
                          Add role: \n";
+	      
+      }
+    }
+	  
+    echo "
                          \n";
+	  
+    // slices
+    echo "
                          Slices
                          \n";
+    if( !empty( $slice_info ) ) {
+	    
+      foreach( $slice_info as $slice ) {
+	$slice_name= $slice['name'];
+	$slice_id= $slice['slice_id'];
+	      
+	echo "$slice_name
                          \n";
+      }
+	    
+    } else {
+      echo "No slices found for that user";
+    }
+	  
+    if ( ! $peer_id ) {
+      echo "\n";
+    } else {
+      echo "
                          \n";
+    }
+	  
+  }
+  if( $peer_id )
+    echo "
                          ";
+  
+  echo "
                          Back to persons list";
+  
+ }
+
+
+// Print footer
+include 'plc_footer.php';
+
+
+?>
diff --git a/planetlab/persons/person_action.php b/planetlab/persons/person_action.php
new file mode 100644
index 0000000..d5bb98e
--- /dev/null
+++ b/planetlab/persons/person_action.php
@@ -0,0 +1,229 @@
+person;
+$_roles= $_person['role_ids'];
+
+
+// get person id
+if( $_POST['person_id'] )
+  $person_id= $_POST['person_id'];
+
+
+// if site_id submitted add the person to that site_id
+if( $_POST['site_add'] ) {
+  $site_id= $_POST['site_add'];
+
+  $api->AddPersonToSite( intval( $person_id ), intval( $site_id ) );
+  header( "location: index.php?id=$person_id" );
+  exit();
+
+}
+
+if ( $_POST['Remove_Sites']){
+  if( $_POST['rem_site'] ) {
+    foreach( $_POST['rem_site'] as $site_id ) {
+      $api->DeletePersonFromSite( intval( $person_id ), intval( $site_id ) );
+    }
+    header( "location: index.php?id=$person_id" );
+    exit();
+  }else{
+    echo "
                          Please select one or more Sites to  remove.
                           \n";
+    echo "
                          Back to person page";
+  }
+}
+
+// remove role
+if ( $_POST['Remove_Roles']){
+  if($_POST['rem_role']) {
+    $rem_ids= $_POST['rem_role'];
+    foreach( $rem_ids as $role_id ) {
+      $api->DeleteRoleFromPerson( intval( $role_id ), intval( $person_id ) );
+    }
+    header( "location: index.php?id=$person_id" );
+    exit();
+  }else{
+    echo "
                          Please select one or more Roles to  remove.
                           \n";
+    echo "
                          Back to person page";
+  }
+}
+
+// add roles
+if( $_POST['add_role'] ) {
+  $role_id= $_POST['add_role'];
+
+  $api->AddRoleToPerson( intval( $role_id ), intval( $person_id ) );
+
+  header( "location: index.php?id=$person_id" );
+  exit();
+}
+
+// enable person
+if( $_GET['enab_id'] ) {
+  $per_id= $_GET['enab_id'];
+
+  $fields= array( "enabled"=>true );
+
+  $api->UpdatePerson( intval( $per_id ), $fields );
+
+  header( "location: index.php?id=$per_id" );
+  exit();
+
+}
+
+// disable person
+if( $_GET['dis_id'] ) {
+  $per_id= $_GET['dis_id'];
+
+  $fields= array( "enabled"=>false );
+
+  $api->UpdatePerson( intval( $per_id ), $fields );
+
+  header( "location: index.php?id=$person_id" );
+  exit();
+  
+}
+
+// if action exists figure out what to do
+if( $_POST['actions'] ) {
+
+  // depending on action, run function
+  switch( $_POST['actions'] ) {
+    case "delete":
+      header( "location: person_action.php?del_id=$person_id" );
+      exit();
+      break;
+    case "disable":
+      header( "location: person_action.php?dis_id=$person_id" );
+      exit();
+      break;
+    case "enable":
+      header( "location: person_action.php?enab_id=$person_id" );
+      exit();
+      break;
+    case "su":
+      plc_debug('plc',$plc);
+      $plc->BecomePerson (intval($person_id));
+      header ( "location: index.php" );
+      break;
+  }
+
+}
+
+// delete person
+if( $_GET['per_id'] ) {
+  $person_id= $_GET['per_id'];
+
+  $api->DeletePerson( intval( $person_id ) );
+
+  header( "location: index.php" );
+  exit();
+ }
+
+//delete a key
+if ( $_POST['Remove_keys'] ){
+  if( $_POST['rem_key'] ) {
+    $key_ids= $_POST['rem_key'];
+    
+    foreach( $key_ids AS $key_id ) {
+      $api->DeleteKey( intval( $key_id ) );
+    }
+    header( "location: index.php?id=$person_id" );
+    exit();
+  }else{
+    echo "
                          Please select one or more keys to remove.
                           \n";
+    echo "
                          Back to person page";
+  }
+ }
+
+// upload a key if the user submitted one
+if ( $_POST['Upload']){
+  if( isset( $_FILES['key'] ) ) {
+    $key_file= $_FILES['key']['tmp_name'];
+    if( $key_file ){
+      $fp = fopen( $key_file, "r" );
+      $key = "";
+      if( $fp ) {
+	// opened the key file, read the one line of contents
+	// The POST operation always creates a file even if the filename
+	// the user specified was garbage.  If there was some problem
+	// with the source file, we'll get a zero length read here.
+	$key = fread($fp, filesize($key_file));
+	fclose($fp);
+	
+	$key_id= $api->AddPersonKey( intval( $person_id ), array( "key_type"=> 'ssh', "key"=> $key ) );
+	
+	if (!$key_id){
+	  $error=  $api->error();
+	  echo "
                           Please verify your SSH  file content.
                           \n";
+	  print '
                          ' . $error . '
                          ';
+	  echo "
                          Back to person page";
+	}
+	else{
+	  header( "location: index.php?id=$person_id" );
+	  exit();
+	}
+      }else {
+	$error= "Unable to open key file.";
+	print '
                          ' . $error . '
                          ';
+      }
+    }else{
+      echo "
                          Please select a valid SSH key file to upload.
                           \n";
+      echo "
                          Back to person page";
+    }
+  }
+ }
+
+// delete person confimation
+if( $_GET['del_id'] ) {
+  $person_id= $_GET['del_id'];
+
+  // get person info from API
+  $person_info= $api->GetPersons( array( intval( $person_id ) ), array( "first_name", "last_name", "email", "roles" ) );
+
+  // start form
+  echo "
                          \n";
+
+  // show delete confirmation
+  echo "
                          Delete ". $person_info[0]['first_name'] ." ". $person_info[0]['last_name'] ."
                          \n";
+  echo "
                          Are you sure you want to delete this user?\n";
+
+  echo "\n";
+  echo "\n";
+  echo "\n";
+
+  echo "
                          Email:  ". $person_info[0]['email'] ."
                          Roles:  ";
+
+  foreach( $person_info[0]['roles'] as $role ) {
+    echo "$role
                          \n";
+  }
+
+  echo "
                          \n";
+  echo "
                          \n";
+  echo "
                          \n";
+
+
+}
+
+// Print footer
+include 'plc_footer.php';
+
+
+?>
\ No newline at end of file
diff --git a/planetlab/persons/register.php b/planetlab/persons/register.php
new file mode 100644
index 0000000..736e894
--- /dev/null
+++ b/planetlab/persons/register.php
@@ -0,0 +1,349 @@
+
+// Copyright (C) 2007 The Trustees of Princeton University
+//
+// $Id: register.php 193 2007-04-04 11:05:28Z thierry $ $
+//
+
+// Get session and API handles
+require_once 'plc_session.php';
+global $plc, $api, $adm;
+
+// Get sorting functions
+require_once 'plc_sorts.php';
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Account Registration');
+include 'plc_header.php';
+
+// Drupalish, but does not use Drupal itself to generate the form
+$form = array();
+$form['first_name'] = array('title' => 'First name', 'required' => TRUE,
+			    'maxlength' => 60, 'size' => 15);
+$form['last_name'] = array('title' => 'Last name', 'required' => TRUE,
+			    'maxlength' => 60, 'size' => 15);
+$form['title'] = array('title' => 'Title', 'required' => FALSE,
+		       'maxlength' => 60, 'size' => 5);
+$form['phone'] = array('title' => 'Telephone', 'required' => FALSE,
+		       'maxlength' => 60, 'size' => 20);
+$form['email'] = array('title' => 'E-mail', 'required' => TRUE,
+		       'maxlength' => 60, 'size' => 30);
+$form['password'] = array('title' => 'Password', 'required' => TRUE,
+		       'maxlength' => 60, 'size' => 20);
+$form['site_ids'] = array('title' => 'Site', 'required' => TRUE);
+$form['roles'] = array('title' => 'Additional Roles', 'required' => FALSE);
+
+//////////////////// additional messages
+$form['email']['comment'] = <<< EOF
+Your E-mail address must be able to receive e-mail and will be
+used as your $PLC_NAME username
+EOF;
+
+$form['site_ids']['comment'] = <<< EOF
+Select the site where you belong 
+EOF;
+
+$form['roles']['comment'] = <<< EOF
+Do not select the Principal Investigator or Technical
+Contact roles unless you have spoken with the current PI of your
+site, and you intend to assume either or both of these roles.
+
                           Use Command-Clic to unselect or for multiple selection
+EOF;
+
+////////////////////
+global $person;
+$person = array();
+foreach ($form as $name => $item) {
+  if (!empty($_REQUEST[$name])) {
+    $person[$name] = $_REQUEST[$name];
+  }
+}
+
+// Filter out "Select a site"
+if (!empty($person['site_ids'])) {
+  $person['site_ids'] = array_filter($person['site_ids'],
+				     create_function('$site_id', 'return intval($site_id) > 0;'));
+}
+
+if (!empty($person)) {
+  // Look for missing/blank entries
+  $missing = array();
+  foreach ($form as $name => $item) {
+    if ($item['required'] && empty($person[$name])) {
+      $missing[] = $item['title'];
+    }
+  }
+  if (!empty($missing)) {
+    $error = "
                            ";
+    foreach ($missing as $field) {
+      $error .= "
                          • $field field is required.
                            • ";
+    }
+    $error .= "
                          ";
+  }
+
+  if (empty($error)) {
+    // N.B.: site_ids and roles are ignored by AddPerson()
+    $person_id = $adm->AddPerson($person);
+    $error = $adm->error();
+  }
+
+  if (empty($error)) {
+    $adm->begin();
+
+    // Add person to requested sites
+    foreach ($person['site_ids'] as $site_id) {
+      $adm->AddPersonToSite($person_id, intval($site_id));
+      $adm->SetPersonPrimarySite($person_id, intval($site_id));
+    }
+
+    // Add requested roles. Always add the user role. 
+    $adm->AddRoleToPerson('user', $person_id);
+    if (!empty($person['roles'])) {
+      foreach ($person['roles'] as $role) {
+	$adm->AddRoleToPerson($role, $person_id);
+      }
+    }
+
+    // Send an e-mail containing a link back to this page, which will
+    // verify the given e-mail address as valid. PIs can still create
+    // and enable accounts on behalf of their users, they just have to
+    // find and enable the accounts manually after registering them.
+    $adm->VerifyPerson($person_id);
+
+    // Disable submit button
+    $person['person_id'] = $person_id;
+
+    $adm->commit();
+    $error = $adm->error();
+  }
+
+  if (!empty($error)) {
+    print '
                          ' . $error . '
                          ';
+  } else {
+    print '
                          Your registration request has been received. An e-mail has been sent to ';
+    print $person['email'];
+    print ' with further instructions.
                          ';
+  }
+}
+
+$PLC_NAME = htmlspecialchars(PLC_NAME);
+
+// E-mail address verified, go ahead and notify the PI (and possibly
+// support if a PI role was requested) that a registration request was
+// received.
+if (!empty($_REQUEST['id']) && !empty($_REQUEST['key'])) {
+  $person_id = intval($_REQUEST['id']);
+  if ($adm->VerifyPerson($person_id, $_REQUEST['key']) != 1) {
+    print '
                          ' . $adm->error() . '.
                          ';
+  } else {
+    $persons = $adm->GetPersons(array($person_id));
+    $person = $persons[0];
+
+    // Remove the password field from the form so that it is not
+    // highlighted as missing.
+    unset($form['password']);
+
+    print '
                          ';
+    print 'Your e-mail address has been verified. ';
+    print 'The PI(s) at your site have been notified of your account registration ';
+
+    if (in_array('pi', $person['roles'])) {
+      $support = PLC_MAIL_SUPPORT_ADDRESS;
+      print " and should contact $PLC_NAME Support <$support>. ";
+      print " $PLC_NAME Support will enable your account if authorized by your PI(s).";
+    } else {
+      print ' and are responsible for enabling your account.';
+    }
+
+    print '
                          ';
+  }
+}
+
+$self = $_SERVER['PHP_SELF'];
+if (!empty($_SERVER['QUERY_STRING'])) {
+  $self .= "?" . $_SERVER['QUERY_STRING'];
+}
+
+$adm->begin();
+
+// All defined sites
+// cannot register with foreign site
+$adm->GetSites(array('is_public' => TRUE, 'peer_id' => NULL), array('site_id', 'name','enabled','peer_id'));
+// All defined roles
+$adm->GetRoles();
+
+list($sites, $roles) = $adm->commit();
+
+// Alphabetize sites by name
+sort_sites($sites);
+
+// Prepend invalid site to beginning of list to force user to select a site
+$sites = array_merge(array(array('site_id' => -1, 'name' => 'Select a site', 'enabled' => TRUE)), $sites);
+
+// Drop down selection box for each site
+function site_option($site) {
+  global $person;
+
+  $site_id = $site['site_id'];
+
+  if (!empty($person['site_ids']) && in_array($site_id, $person['site_ids'])) {
+    $selected = 'selected="selected"';
+  } else {
+    $selected = "";
+  }
+
+  $option = "";
+  return $option;
+}
+$role_options = implode("\n", array_map('role_option', $roles));
+
+$self = $_SERVER['PHP_SELF'];
+if (!empty($_SERVER['QUERY_STRING'])) {
+  $self .= "?" . $_SERVER['QUERY_STRING'];
+}
+
+print <<
+
+
                          
+
+
+EOF;
+
+foreach ($form as $name => $item) {
+
+  if ( ! empty($item['comment'])) {
+    $comment=$item['comment'];
+    print "";
+    print "";
+  }
+
+  $title = $item['title'];
+  $required = $item['required'] ? '*' : "";
+  $class = $item['required'] ? "required" : "";
+  if ($item['required'] && !empty($person) && empty($person[$name])) {
+    $class .= " error";
+  }
+
+  // Label part
+  print "";
+  print <<\n
+EOF;
+
+  // input part
+  switch ($name) {
+
+  case 'site_ids':
+    print <<\n
+EOF;
+    break;
+
+  case 'roles':
+    print <<\n
+EOF;
+    break;
+
+  default:
+    $maxlength = $item['maxlength'];
+    $size = $item['size'];
+    $value = !empty($person[$name]) ? $person[$name] : "";
+    $type = $name == 'password' ? "password" : "text";
+    print <<\n
+EOF;
+
+  }
+
+  print "\n";
+}
+
+// Do not allow resubmits
+if (empty($person['person_id'])) {
+  print '';
+}
+
+print <<
+
+
+
+EOF;
+
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/persons/reset_password.php b/planetlab/persons/reset_password.php
new file mode 100644
index 0000000..2083970
--- /dev/null
+++ b/planetlab/persons/reset_password.php
@@ -0,0 +1,73 @@
+
+// Copyright (C) 2007 The Trustees of Princeton University
+//
+// $Id: reset_password.php 185 2007-04-04 09:33:43Z thierry $ $
+//
+
+// Get session and API handles
+require_once 'plc_session.php';
+global $plc, $api, $adm;
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Reset Password');
+include 'plc_header.php';
+
+if (!empty($_REQUEST['id']) && !empty($_REQUEST['key'])) {
+  $person_id = intval($_REQUEST['id']);
+  if ($adm->ResetPassword($person_id, $_REQUEST['key']) != 1) {
+    print '
                          ' . $adm->error() . '.
                          ';
+  } else {
+    drupal_set_html_head("';
+    print "An e-mail has been sent to you with your new temporary password. ";
+    print "Please change this password as soon as possible. ";
+    print "You will be re-directed to the login page in 5 seconds.";
+    print '';
+  }
+} elseif (!empty($_REQUEST['email'])) {
+  if ($adm->ResetPassword($_REQUEST['email']) != 1) {
+    print '
                          ' . $adm->error() . '.
                          ';
+  } else {
+    drupal_set_html_head("';
+    print "An e-mail has been sent to " . $_REQUEST['email'] . " with further instructions. ";
+    print "You will be re-directed to the login page in 5 seconds.";
+    print '';
+  }
+}
+
+$self = $_SERVER['PHP_SELF'];
+if (!empty($_SERVER['QUERY_STRING'])) {
+  $self .= "?" . $_SERVER['QUERY_STRING'];
+}
+
+// XXX Use our own stylesheet instead of drupal.css
+print <<
+
                          
+
+
                             
                           $comment: 
                          
+  
+    
+  
+
                          
+      
                          
+	E-mail: *
+	
+      
                          
+      
+    
                          
+
+
+
+
+EOF;
+
+include 'plc_footer.php';
+
+?>
diff --git a/planetlab/persons/test.php b/planetlab/persons/test.php
new file mode 100644
index 0000000..61f70e2
--- /dev/null
+++ b/planetlab/persons/test.php
@@ -0,0 +1,39 @@
+GetPersons( array( "email" => $input ), array("email") );
+  if (count($persons)) {
+    foreach ( $persons as $person ) {
+      $aResults[] = $person['email'];
+    }
+  }
+}
+
+header("Content-Type: text/xml");
+
+echo "
+";
+for ($i=0;$i".$aResults[$i]."";
+
+echo "
+
+";
+
+?>
diff --git a/planetlab/persons/update.php b/planetlab/persons/update.php
new file mode 100644
index 0000000..cd7f99c
--- /dev/null
+++ b/planetlab/persons/update.php
@@ -0,0 +1,181 @@
+person;
+$_roles= $_person['role_ids'];
+
+
+$is_submitted= isset($_POST['submitted']) ? $_POST['submitted'] : 0;
+
+// show details for the current user.
+if( isset($_GET['id']) && is_numeric($_GET['id']) ) {
+  $person_id= intval($_GET['id']);
+ } else {
+  header( "location: index.php" );
+  exit();
+ }
+
+$errors= array();
+
+if( $is_submitted ) {
+  // attempt to update this person
+  $first_name= $_POST['first_name'];
+  $last_name= $_POST['last_name'];
+  $title= $_POST['title'];
+  $email= $_POST['email'];
+  $phone= $_POST['phone'];
+  $url= $_POST['url'];
+  $bio= str_replace("\r", "", $_POST['bio']);
+  $password1= $_POST['password1'];
+  $password2= $_POST['password2'];
+
+  if( $password1 != $password2 ) {
+    $errors[]= "The passwords do not match";
+  }
+
+  if( count($errors) == 0 ) {   
+    $update_vals= array();
+    $update_vals['first_name']= $first_name;
+    $update_vals['last_name']= $last_name;
+    $update_vals['title']= $title;
+    $update_vals['email']= $email;
+    $update_vals['phone']= $phone;
+    $update_vals['url']= $url;
+    $update_vals['bio']= $bio;
+		
+    if( $password1 != "" )
+      $update_vals['password']= $password1;
+    
+    $rc= $api->UpdatePerson( intval( $person_id ), $update_vals);
+    
+    if( $rc == 1 ) {
+      Header( "Location: /db/persons/index.php?id=$person_id" );
+      exit();
+    }
+    elseif ($rc === NULL) {
+      $errors[] = $api->error();
+    }
+  }
+ } else {
+  // get details for the user
+  $person_details= $api->GetPersons( array( intval( $person_id ) ), array( "person_id", "first_name", "last_name", "title", "email", "phone", "url", "bio" ) );
+  if ( $person_details === NULL ) {
+    $errors[] = $api->error();
+  } else {
+    $person_detail= $person_details[0];
+  
+    $first_name= $person_detail['first_name'];
+    $last_name= $person_detail['last_name'];
+    $title= $person_detail['title'];
+    $email= $person_detail['email'];
+    $phone= $person_detail['phone'];
+    $url= $person_detail['url'];
+    $bio= $person_detail['bio'];
+  }
+}
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Update Person');
+include 'plc_header.php';
+
+?>
+
+
                          Update Account
                          
+
+ 0 )
+{
+  print( "
                          The following errors occured:" );
+  print( "
                            \n" );
+  foreach( $errors as $err )
+    {
+      print( "
                          • $err\n" );
+    }
+  print( "
                          \n" );
+}
+?>
+
+
                          Personal Information
                          
+
+
                          
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                          First Name:
                          Last Name:
                          Title:
                          Email:
                          Phone:
                          URL:
                          Bio:
                          Password (blank for no change):
                          Repeat Password:
                          
+
+
+
+
                          
+
+
diff --git a/planetlab/pub/feedback.php b/planetlab/pub/feedback.php
new file mode 100644
index 0000000..0223f22
--- /dev/null
+++ b/planetlab/pub/feedback.php
@@ -0,0 +1,165 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: feedback.php 144 2007-03-28 07:52:20Z thierry $
+//
+
+// Get API handle
+require_once 'plc_session.php';
+global $adm;
+
+// Get sorting functions
+require_once 'plc_sorts.php';
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Slice Feedback');
+include 'plc_header.php';
+
+if (isset($_REQUEST['slices']) && is_array($_REQUEST['slices'])) {
+  $slice_names = $_REQUEST['slices'];
+  $selected = 'selected="selected"';
+} else {
+  $slice_names = array();
+}
+
+// Return all slices and users of those slices
+$slices = $adm->GetSlices($slice_names, array('name', 'person_ids'));
+
+$email = "";
+if (isset($_REQUEST['email'])) {
+  // Email Address Verification with PHP
+  // http://www.devshed.com/c/a/PHP/Email-Address-Verification-with-PHP/
+  // checks proper syntax
+  $email = $_REQUEST['email'];  
+  if (preg_match("/^[a-zA-Z0-9_\.-]+@[a-zA-Z0-9\.-]+$/", $email)) {
+    list($username, $domain) = split('@', $email);
+    // prevent default domain from being appended
+    $domain .= ".";
+    // check if the domain has MX records, or is at least resolvable
+    if (getmxrr($domain, $mxhosts) || checkdnsrr($domain, 'ANY')) {
+      $valid_email = $email;
+    }
+  }
+}
+
+$comments = "";
+if (isset($_REQUEST['comments'])) {
+  $comments = $_REQUEST['comments'];
+}
+
+if (isset($_REQUEST['submitted']) && isset($valid_email) && $slices) {
+  foreach ($slices as $slice) {
+    $to = array();
+
+    if (defined('PLC_MAIL_SLICE_ADDRESS')) {
+      $to[] = str_replace('SLICE', $slice['name'], PLC_MAIL_SLICE_ADDRESS);
+    } else {
+      // Get all users in the slices
+      foreach ($adm->GetPersons($slice['person_ids'], array('person_id', 'email'))
+	       as $person) {
+	$to[] = $person['email'];
+      }
+    }
+
+    $to = array_unique($to);
+
+    $headers  = "Content-type: text/plain\r\n";
+    $headers .= "From: $valid_email\r\n";
+    $headers .= "Reply-To: $valid_email\r\n";
+    $headers .= "X-Mailer: PHP/" . phpversion() . "\r\n";
+
+    $subject  = PLC_NAME . " Slice Feedback - " . $slice['name'];
+
+    $message  = $subject . "\r\n";
+    $message .= "\r\n";
+
+    // Print comments
+    $message .= PLC_NAME . " has received feedback from $valid_email regarding\r\n";
+    $message .= "your slice:\r\n";
+    $message .= "\r\n";
+    $message .= strip_tags($comments) . "\r\n";
+    $message .= "\r\n";
+    
+    $message .= "Please contact $valid_email at your convenience.\r\n";
+
+    // XXX API should handle this, since it handles Unicode
+    // properly. Since neither PHP4 nor PHP5 can pass Unicode via XML-RPC right
+    // now anyway, though, it doesn't really ematter.
+    if (PLC_MAIL_ENABLED) {
+      mail(implode(", ", $to), $subject, $message, $headers);
+    }
+  }
+   
+  // Pause to limit spams
+  sleep(5);
+
+  echo <<Thank You
+
+
                          Thank you for your feedback. The principals responsible for each
+slice will respond to your concerns as soon as possible.
                          
+
+EOF;
+
+  if (PLC_WWW_DEBUG) {
+    print '
                          ';
+    print "To: " . implode(", ", $to) . "\r\n";
+    print htmlspecialchars($headers);
+    print "\r\n";
+    print htmlspecialchars($message);
+    print '
                          ';
+  }
+
+} else {
+
+  $self = $_SERVER['PHP_SELF'];
+  if (!empty($_SERVER['QUERY_STRING'])) {
+    $self .= "?" . $_SERVER['QUERY_STRING'];
+  }
+
+  echo <<Select the slices for which you would like to provide feedback.
                          
+
+
                          
+
+EOF;
+
+$select_size = min(10, count($slices));
+print "';
+
+$email = htmlspecialchars($email);
+$comments = htmlspecialchars($comments);
+
+echo <<Briefly describe your concerns in the Comments field, provide a
+Contact E-mail address, and click Send.
                          
+
+
                          
+Contact E-mail
                          
+
                          
+
+Comments
                          
+
                          
+
+
+
+
                          
+
+EOF;
+
+}
+
+include 'plc_footer.php';
diff --git a/planetlab/pub/sites.php b/planetlab/pub/sites.php
new file mode 100644
index 0000000..7fe70c4
--- /dev/null
+++ b/planetlab/pub/sites.php
@@ -0,0 +1,55 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: sites.php 144 2007-03-28 07:52:20Z thierry $ $
+//
+
+// Get API handle
+require_once 'plc_session.php';
+global $adm;
+
+// Get sorting functions
+require_once 'plc_sorts.php';
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Sites');
+include 'plc_header.php';
+
+?>
+
+
                          The following sites currently host or plan to host  nodes:
                          
+
+
                            
+
+GetSites(array('is_public' => TRUE), array('name', 'url'));
+sort_sites($sites);
+
+foreach ($sites as $site) {
+  $name = htmlspecialchars($site['name']);
+  $url = $site['url'];
+  print "
                          • ";
+  if ($url) {
+    print "$name";
+  } else {
+    print "$name";
+  }
+  print "
                            • ";
+}
+
+?>
+
+
                          
+
+
diff --git a/planetlab/pub/slices.php b/planetlab/pub/slices.php
new file mode 100644
index 0000000..92383d3
--- /dev/null
+++ b/planetlab/pub/slices.php
@@ -0,0 +1,158 @@
+
+// Copyright (C) 2006 The Trustees of Princeton University
+//
+// $Id: slices.php 144 2007-03-28 07:52:20Z thierry $ $
+//
+
+// Get API handle
+require_once 'plc_session.php';
+global $adm;
+
+// Get sorting functions
+require_once 'plc_sorts.php';
+
+// Get PlanetFlow stats
+global $planetflow, $active_bytes;
+include_once '_gen_planetflow.php';
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Projects');
+include 'plc_header.php';
+
+if (isset($_REQUEST['active'])) {
+
+?>
+
+
                          A slice is essentially a login account on a set of nodes. The
+following is a list of the most active slices; you may also view a
+list of all slices.
                          
+
+
+
+
                          A slice is essentially a login account on a set of nodes. The
+following is a list of all slices; you may also view a list of just the most active slices.
                          
+
+
+
+
                          To provide feedback to the principals responsible for each slice,
+check the Feedback box for each slice that you would like to
+comment on, then click Provide Feedback.
                          
+
+
                          
+
+
+  
+    
+      
+      
+      
+      
+      
+    
+  
+  
+
+GetSites(NULL, array('abbreviated_name', 'site_id'))
+	 as $site) {
+  $sites[$site['site_id']] = $site;
+}
+
+// Get all slices
+$slices = $adm->GetSlices(NULL, array('name', 'url', 'description', 'site_id'));
+
+// List just the active slices
+if (isset($_REQUEST['active'])) {
+  // Byte threshold to be considered "active"
+  if (!empty($_REQUEST['mbytes'])) {
+    $active_bytes = intval($_REQUEST['mbytes'])*1024*1024;
+  } else {
+    $active_bytes = 100*1024*1024;
+  }
+
+  // Filter just the active slices
+  function __active_slice($slice) {
+    global $planetflow, $active_bytes;
+    return isset($planetflow[$slice['name']]) &&
+      ($planetflow[$slice['name']]['bytes'] >= $active_bytes);
+  }
+  $slices = array_filter($slices, '__active_slice');
+  
+  // Sort active slices by bytes in descending order
+  function __cmp_slices_by_bytes($slicea, $sliceb) {
+    global $planetflow;
+    return ($planetflow[$slicea['name']]['bytes'] > $planetflow[$sliceb['name']]['bytes']) ? -1 : 1;
+  }
+  usort($slices, '__cmp_slices_by_bytes');
+} else {
+  // Alphabetically sort slices
+  sort_slices($slices);
+}
+
+$class = "";  
+foreach ($slices as $slice) {
+  print "";
+
+  print '';
+
+  print '';
+
+  print '';
+
+  print '';
+
+  print '';
+
+  print '';
+
+  $class = $class == "oddrow" ? "" : "oddrow";
+}
+
+?>
+
+  
+
                          SliceDescriptionSiteMBytes/dayFeedback
                          ' .
+    htmlspecialchars($slice['name']) .
+    '';
+  print htmlspecialchars(trim($slice['description']));
+  if (!empty($slice['url'])) {
+    if (strncasecmp($slice['url'], "http", 4) != 0) {
+      $slice['url'] = "http://" . $slice['url'];
+    }
+    print '
                          More details...';
+  }
+  print '                          		';
+  if (isset($sites[$slice['site_id']])) {
+    $site = $sites[$slice['site_id']];
+    print htmlspecialchars($site['abbreviated_name']);
+  }
+  print '';
+  if (isset($planetflow[$slice['name']]) &&
+      isset($planetflow[$slice['name']]['bytes']) &&
+      $planetflow[$slice['name']]['bytes']/1024/1024 >= 1) {
+    print number_format($planetflow[$slice['name']]['bytes']/1024/1024, 0, '.', ',');
+  }
+  print '';
+  print '';
+  print '
                          
+
+
+
+
                          
+
+
diff --git a/planetlab/sirius/index.php b/planetlab/sirius/index.php
new file mode 100644
index 0000000..c41fac0
--- /dev/null
+++ b/planetlab/sirius/index.php
@@ -0,0 +1,764 @@
+person;
+$_roles= $_person['role_ids'];
+
+//require 'sirius_func.php';
+
+// Print header
+require_once 'plc_drupal.php';
+drupal_set_title('Sirius');
+include 'plc_header.php';
+
+?>
+
+
                          Sirius Calendar Service
                          
+
+You can choose to run your experiment at the earliest available
+time or give a specific time.  The number of repetitions has
+the following meaning: if you want your job re-inserted on the
+schedule list (in the earliest slot available) directly after it 
+gets a priority increase, you can do so (up to 4 times).  Currently, 
+our admission control policy is that we 
+allow only one slice per time slot.  
                          
+
+Currently, 
+time slots are only allocated on the granularity
+of an hour, and
+only CPU is increased.
+
+
                          
+Current Schedule
+
                          
+
+setDebug(0);
+
+  $_api_auth = new xmlrpcval(array(
+				   "AuthMethod" => new xmlrpcval("password"),
+				   "Username" => new xmlrpcval($username),
+				   "AuthString" => new xmlrpcval($password),
+				   "Role" => new xmlrpcval("user")), "struct");
+  
+  $func = new xmlrpcmsg("SliceInfo");
+  $func->addParam($_api_auth);
+
+  $result = $_api->send($func, 15, 'https');
+
+  if( $result == 0 ) {
+    //    printf("problem: %s\n", $_api->errstring);
+    return 0;
+  }
+  else if($result->faultCode() != 0) {
+    //    printf("server problem: %s\n", $result->errstr);
+    return 0;
+  }
+  else {
+    $result_value = $result->value();
+
+    if( !$result_value ) {
+      //      printf( "didn't get value back from api\n" );
+      return 0;
+    }
+    else {
+      $arr = xmlrpc_decode($result_value);
+      //      printf( "return value success, value %s\n", $val);
+      //      print_r($val);
+      $numElements = count($arr);
+      $i = 0;
+      while ($i < $numElements) {
+	if ($sn == $arr[$i][name])
+	  return 1;
+	$i++;
+      }
+      return 0;
+    }
+  }
+  */
+	
+	global $api;
+  
+  $slice_list= array();
+  $result= $api->GetSlices( $slice_list, array( "name" ) );
+  
+  foreach ( $result AS $slice )
+  {
+  	if ( $slice["name"] == $sn )
+  		return 1;
+	
+  }
+  
+  return 0;
+  
+}
+
+//can a request be satisfied?  Currently, answer is yes unless
+//either this time is taken or you asked for more than one unit
+//probably will need to change this.  
+function validateRequest ($units, $timesOccupied, $requestedTime, $currentTime) {
+  if ($units != 1)
+    return TOO_MANY_UNITS;
+
+  // buffer so we aren't too close to deadline, if your request is late
+  // OR if it's within 1 minute of deadline, it's too late
+  if ($requestedTime - 60 <= $currentTime)
+    return TIME_ALREADY_OCCURRED;
+
+  if (array_key_exists($requestedTime, $timesOccupied)) {
+    if ($timesOccupied[$requestedTime] == MAX_JOBS)
+      return NO_ROOM;
+  }
+  return SUCCESS;
+}
+
+//can a request be satisfied?  Currently, answer is yes unless
+//either this time is taken or you asked for more than one unit
+//probably will need to change this.  
+function validateAndMarkRequest ($units, &$timesOccupied, $requestedTime, $currentTime, $sn, $jobArray) {
+  // buffer so we aren't too close to deadline, if your request is late
+  // OR if it's within 1 minute of deadline, it's too late
+  if ($requestedTime - 60 <= $currentTime)
+    return TIME_ALREADY_OCCURRED;
+
+  if (array_key_exists($requestedTime, $timesOccupied)) {
+    if ($timesOccupied[$requestedTime] == MAX_JOBS)
+      return NO_ROOM;
+    else
+      $timesOccupied[$requestedTime]++;
+  }
+  else {
+    $timesOccupied[$requestedTime] = 1;
+    if (array_key_exists($sn, $jobArray)) {
+      $ts = $jobArray[$sn]["timestamp"];
+      $timesOccupied[$ts]--;
+    }
+  }
+
+  if ($units != 1)
+    return TOO_MANY_UNITS;
+
+  return SUCCESS;
+}
+
+function findNextFreeSlot($units, $timesOccupied) {
+  $currYear = gmdate("y");
+  $currMonth = gmdate("m");
+  $currDate = gmdate("d");
+  $currHour = gmdate("H") + 1;
+  $currentTime = gmmktime();
+  $reqTime = gmmktime($currHour, 0, 0, $currMonth, $currDate, $currYear);
+  $retVal = 1;
+  while ($retVal != SUCCESS) {
+    $retVal = validateRequest($units, $timesOccupied, $reqTime, $currentTime);
+    if ($retVal == NO_ROOM || $retVal == TIME_ALREADY_OCCURRED) { // advance timestamp one hour (3600 seconds)
+      $reqTime = $reqTime + 3600;
+    }
+  }
+  return $reqTime;
+}
+
+function dumpToFile($fileName, $buffer, $which, $timesOccupied) {
+  //open file, and dump newly list into it (buffer is the list)
+  //we're just currently overwriting (fopen with "w" truncates)
+
+  $fileHandle = fopen($fileName, "w");
+  //periodically, updateSliceUnits program will update the slices file
+  //this function is general, works for schedule or slices file
+
+  //lock in case of concurrent accesses
+  flock($fileHandle, LOCK_EX);
+  
+  if ($which == "schedule") {  // need to write timestamp in this case
+    $s = gettimeofday();
+    fwrite($fileHandle, $s[sec]);
+    fwrite($fileHandle, "\n");
+  }
+
+  //do the dump here
+  foreach ($buffer as $value) {
+    $t = "";
+    if ($which == "schedule") {  
+      if (strcmp($value["timestamp"], mktime()) > 0) {
+	$numReps = $value["reps"];
+	$ts = $value["timestamp"];
+	$t = $value["sliceName"]." ".$value["id"]." ".$value["timestamp"]." ".$value["units"]." ".$value["reps"]." \n";
+      }
+      else {  // job expired, does it need be run again?
+	if ($value["reps"] > 0) {
+	  $ts = findNextFreeSlot($value["units"], $timesOccupied);
+	}
+	$numReps = $value["reps"] - 1;
+      }
+      if ($numReps >= 0)
+	$t = $value["sliceName"]." ".$value["id"]." ".$ts." ".$value["units"]." ".$numReps." \n";
+    }
+    else if ($which == "slices") {
+      $t = $value["sliceName"]." ".$value["units"]." \n";
+    }
+
+    if ($t != "")
+      fwrite($fileHandle, $t);
+
+  }
+
+  flock($fileHandle, LOCK_UN);
+
+  fclose($fileHandle);
+}
+
+//update the slice file, takes a slice name (name) and number of units
+function updateSliceFile($name, $units) {
+  $dummyArray = array();
+
+  $sliceFile = fopen("/var/www/html/planetlab/sirius/slices.txt", "rw");
+  if (!$sliceFile) {
+    echo "
                          Unable to open remote file.
                          "; 
+    
+  }
+
+  flock($sliceFile, LOCK_EX);
+
+  //we'll construct a new list here, will be current slice file except 
+  //the slice in question will have it's units decreased, if there are any...
+  while (!feof($sliceFile)) {
+    $num = fscanf($sliceFile, "%s %d\n", $sliceName, $unitsAvailable);
+    //for some reason feof seems to not quite work
+    //precisely, the last entry in the file is read twice (!?!), so hack here
+    if ($num == 0)
+      break;
+
+    $newArray["sliceName"] = $sliceName;
+    if ($name == $sliceName) {
+      $newUnits = $unitsAvailable - $units;
+      if ($newUnits < 0)  // error, slice has no more units
+	return -1;
+      else
+	$newArray["units"] = $newUnits;
+    }
+    else
+      $newArray["units"] = $unitsAvailable;
+    //append this tuple to the entire array
+    $sliceArray[] = $newArray;
+  }
+  flock($sliceFile, LOCK_UN);
+  fclose($sliceFile);
+  //do the dump to new file
+  dumpToFile("/var/www/html/planetlab/sirius/slices.txt", $sliceArray, "slices", dummyArray);
+  return 0;
+}
+
+
+//pretty obvious what this does; basically, does the slice exist in
+//the slice file yet?  (New user of calendar service user may not have 
+//an entry)
+function isFirstSliceRequest($name) {
+  $sliceFile = fopen("/var/www/html/planetlab/sirius/slices.txt", "r");
+  if (!$sliceFile) {
+    echo "
                          Unable to open remote file.
                          "; 
+    
+  }
+
+  flock($sliceFile, LOCK_EX);
+
+  while (!feof($sliceFile)) {
+    $num = fscanf($sliceFile, "%s %d\n", $sliceName, $unitsAvailable);
+    //for some reason feof seems to not quite work
+    //precisely, the last entry in the file is read twice (!?!), so hack here
+    if ($num == 0)
+      break;
+
+    if ($name == $sliceName) {
+      flock($sliceFile, LOCK_UN);
+      fclose($sliceFile);
+      return 0;
+    }
+  }
+
+  flock($sliceFile, LOCK_UN);
+  fclose($sliceFile);
+  return 1;
+}
+
+
+function cmp ($a, $b) {
+  if ($a["timestamp"] == $b["timestamp"])
+    return 0;
+  else
+    return ($a["timestamp"] < $b["timestamp"]) ? -1 : 1;
+}
+
+function checkForErrors($requestStatus) {
+  if ($requestStatus == NO_ROOM) {
+    printf(" Error: Cannot add your request; that time slot is currently full.  
                          ");
+  }
+  else if ($requestStatus == TOO_MANY_UNITS) {
+    printf(" Error: Cannot add your request; only 1 extra unit is allowed. 
                          ");
+  }
+  else if ($requestStatus == NO_UNITS_LEFT) {
+    printf(" Error: Cannot add your request; no more units remaining. 
                          ");
+  }
+  else if ($requestStatus == TIME_ALREADY_OCCURRED) {
+    printf(" Error: Cannot add your request; that time has already occurred, or is too close to the current time. 
                          ");
+  }
+  else if ($requestStatus == NO_SUCH_SLICE) {
+    printf(" Error: Cannot delete nonexistent slice. 
                          ");
+  }
+  else if ($requestStatus == NOT_SLICE_OWNER) {
+    printf(" Error: Only authorized user can manipulate slice. 
                          ");
+  }
+  else if ($requestStatus == TOO_CLOSE_TO_DEADLINE) {
+    printf(" Error: Cannot delete your request; it is too close to
+the time that your slice will receive its priority increase. 
                          ");
+  }
+}
+
+function getCurrentSchedule (&$jobArray, &$timesOccupied, &$maxId) {
+
+  $schedFile = fopen("/var/www/html/planetlab/sirius/schedule.txt", "r");
+  if (!$schedFile) {
+    echo "
                          Unable to open remote file.
                          "; 
+    
+  }
+
+  flock($schedFile, LOCK_EX);
+
+  //first line is timestamp, throw it away.
+  fscanf($schedFile, "%s\n", $str);
+
+  //read in current file into array
+  $jobArray = array();
+  $newArray = array();
+  $timesOccupied = array();
+  $maxId = 0;
+  while (!feof($schedFile)) {
+    $num = fscanf($schedFile, "%s %d %s %d %d\n", $sliceName, $id, $timestamp, $units, $reps);
+
+    if ($id > $maxId)
+      $maxId = $id;
+
+    //for some reason feof seems to not quite work
+    //precisely, the last entry in the file is read twice (!?!), so hack here
+    if ($num == 0)
+      break;
+    $newArray["sliceName"] = $sliceName;
+    $newArray["id"] = $id;
+    $newArray["units"] = $units;
+    $newArray["timestamp"] = $timestamp;
+    $newArray["reps"] = $reps;
+    $jobArray[$sliceName] = $newArray;
+
+    if (array_key_exists($timestamp, $timesOccupied)) {
+      $timesOccupied[$timestamp]++;
+    }
+    else {
+      $timesOccupied[$timestamp] = 1;
+    }
+
+  }
+
+  flock($schedFile, LOCK_UN);
+  fclose($schedFile);
+
+}
+
+// Reid: after below function call, you have the current schedule.
+// It is stored in $jobArray, which is an array of arrays.  
+// Layout: each element of $jobArray is an array with
+//         the following fields.
+//   "sliceName": the name of the slice that occupies the slot
+//   "id": the id of the slice, currently not used; do not display
+//   "units": another field that will be used eventually...but not yet
+//   "reps": indicates how many repetitions slice has specified; for
+//           each repetition, the slice is automatically rescheduled
+//           after running for the earliest available slot
+// I don't know if you want to pring the schedule out as part of the
+// queue here, or wait to see if there was a submitted job.
+// See my comments below for more details.
+
+getCurrentSchedule ($jobArray, $timesOccupied, $maxId);
+
+$changeMade = 0;
+
+// Reid: here, we see if a new request is submitted (which would
+//       be done now as: did the user click into the queue and
+//       select a slice to get the next slot.  I think you can just
+//       skip to the end of this if statement (see comment below)
+
+// Reid: The problem here is, this is based on the current submission
+//       procedure, which is: click the submit button (or the delete
+//       button).  I'm not sure how to change or modularize this
+//       function because I don't know how the queue would precisely
+//       be implemented.  I've commented the code below to try to help.
+
+//if form was submitted with new job, process it
+if (isset($_POST['action']) && $_POST['action'] == 'submitted') {
+  $sname = $_POST['sliceName'];
+
+  if (!authorizeSlice($sname)) {
+    $requestStatus = NOT_SLICE_OWNER;
+  }
+  else if ($_POST['add_delete'] == "delete") {
+    // delete request.  Make sure it exists and is early enough to delete,
+    // then delete it.
+    if (array_key_exists($sname, $jobArray)) {
+      $changeMade = 1;
+      $ts = $jobArray[$sname]["timestamp"];
+      if ($ts - mktime() < DELETE_THRESHOLD)
+	$requestStatus = TOO_CLOSE_TO_DEADLINE;
+      else {
+	$timesOccupied[$ts]--;
+	unset($jobArray[$sname]);
+      }
+    }
+    else 
+      $requestStatus = NO_SUCH_SLICE;
+  }
+
+  else {
+    // it's an add request
+    // grab all the data from the user.
+    $changeMade = 1;
+    //    $minute = $_POST['minute'];
+    $reps = $_POST['reps'];
+    //  $u = $_POST['units'];
+    $u = 1;
+    
+    $currentTime = mktime();
+
+    if ($_POST['whenToRun'] == "asap") {
+      $requestedTime = findNextFreeSlot($u, $timesOccupied);
+    }
+    else {
+      //      $requestedTime = gmmktime($hour, $minute, 0, $month, $date, $year);
+      if (!isset( $_POST['queue_time'] )) {
+	$year = $_POST['year'];
+	$month = $_POST['month'];
+	$date = $_POST['date'];
+	$hour = $_POST['hour'];
+	$requestedTime = gmmktime($hour, 0, 0, $month, $date, $year);
+      }
+      else {
+	$currYear = gmdate("y");
+	$currMonth = gmdate("m");
+	$currDate = gmdate("d");
+	$currHour = gmdate("H");
+	$hour = $_POST['queue_time'];
+	if ($hour < $currHour) {
+	  $requestedTime = gmmktime($hour, 0, 0, $currMonth, $currDate+1, $currYear);
+	}
+	else
+	  $requestedTime = gmmktime($hour, 0, 0, $currMonth, $currDate, $currYear);
+      }
+    }
+    
+    $id = $maxId + 1;
+    
+    $requestStatus = validateAndMarkRequest($u, $timesOccupied, $requestedTime, $currentTime, $sname, $jobArray);
+    if ($requestStatus == SUCCESS) {
+      // ignore below, it is for future work anyways.
+      if (isFirstSliceRequest($sname)) {
+	$sliceFile = fopen("/var/www/html/planetlab/sirius/slices.txt", "a");
+	if ($sliceFile == 0) {
+	  echo "
                          Unable to open file.
                          "; 
+	  
+	}
+	flock($sliceFile, LOCK_EX);
+	
+	// should be max number of units, not 5
+	// why is this 6?
+	fwrite($sliceFile, $sname." "."6");
+	flock($sliceFile, LOCK_UN);
+	fclose($sliceFile);
+      }
+      // if (updateSliceFile($sname, 1) < 0)
+      // temporarily not looking at units...
+      if (0)
+	$requestStatus = NO_UNITS_LEFT;  
+      else {
+	// here, pretty simple, just stick all data into 
+	// array element, then stick array into $jobArray.
+	$newArray["sliceName"] = $sname;
+	$newArray["id"] = $id;
+	$newArray["timestamp"] = $requestedTime;
+	$newArray["units"] = $u;
+	$newArray["reps"] = $reps;
+	$jobArray[$sname] = $newArray;
+      }
+    }
+  }
+  //  header("Location: planetcal.php");
+}
+
+//sort job array by earliest time first ("cmp" function does this)
+usort($jobArray, "cmp");  
+
+// Reid: after this above line, $jobArray holds a sorted list that
+//       you can output as the queue.
+
+// Reid: below is the current printing of the schedule, which would
+//       certainly be deleted when you have the better representation
+//       of the schedule (the visual queue).  It starts here and ends
+//       where I've marked below.
+
+//print current job list as table on screen
+printf("");
+if (count($jobArray) > 0) {
+  printf("");
+  printf("");
+  printf("");
+}
+else {
+  printf("");
+  printf("");
+  printf("");
+}
+
+$deletedExpiredJob = 0;
+
+$arr= array();
+$n= 0;
+foreach ($jobArray as $value) {
+  if (strcmp($value["timestamp"], mktime()) > 0) {
+    printf("\n");
+    printf("\n", $value["sliceName"], $value["reps"], gmdate("r", $value["timestamp"]));
+    $arr[$n]= $value["sliceName"];
+    $n++;
+    printf("\n");
+  }
+  else {
+    $deletedExpiredJob = 1;
+  }
+}
+printf("
                           Slice name   Repetitions  Time of priority 
                          No jobs currently on queue 
                           %s  %d  %s 
                          \n");
+echo "
                          \n";
+// Reid: end of current printing of the schedule.
+
+// Reid: here is where we put the data back to the schedule file.
+//       It's already a function, 
+
+function findNextQueue($units, $timesOccupied, $arr) {
+
+  $currYear = gmdate("y");
+  $currMonth = gmdate("m");
+  $currDate = gmdate("d");
+  $currHour = gmdate("H") + 1;
+  $currentTime = gmmktime();
+  $reqTime = gmmktime($currHour, 0, 0, $currMonth, $currDate, $currYear);
+  $retVal = 1;
+  $i = 0;
+	
+
+	// DAVE
+	// outputting table to display the queue
+	// green background will mean slot is open, and red will mean the slot is used
+	// 
+  echo "\n";
+  echo "\n";
+  echo "\n";
+
+  echo "
                          24 hour Queue: Choose the GMT time slot you desire (green slots are open, red are taken) 
                          \n";
+
+  // here's what this does below: it goes through each hour, and sees if the slot is occupied
+  // if so, it outputs in red, w/ slice name ($arr[$x], where $x is the number request, i.e.
+  // earlier when we dump out the list of slices on the schedule, we do $arr[$x++] = $slicename
+  $x= 0;
+  //  while ($reqTime < ( $reqTime + ( 24 * 3600 ) ) ) {
+  while ($i < 12) {
+    $retVal = validateRequest($units, $timesOccupied, $reqTime, $currentTime);
+    if ($retVal == SUCCESS) { // advance timestamp one hour (3600 seconds)
+	  
+	echo "\n";
+    }
+    else {
+	echo"\n";
+	$x++;
+    }
+
+    $reqTime = $reqTime + 3600;
+    $i++;
+  }
+  echo "
                           " . gmdate("H:i:s", $reqTime) . "    
                           " . $arr[$x] . " 
                          		   \n";
+
+  while ($i < 24 && $i > 11) {
+    $retVal = validateRequest($units, $timesOccupied, $reqTime, $currentTime);
+    if ($retVal == SUCCESS) { // advance timestamp one hour (3600 seconds)
+
+        echo "\n";     }
+    else {
+        echo"\n";
+	$x++;
+    }
+
+    $reqTime = $reqTime + 3600;
+    $i++;
+  }
+  echo "
                           " . gmdate("H:i:s", $reqTime) . "    
                           " . $arr[$x] . " 
                          \n";
+
+}
+
+function sliceDropDown() {
+  /*
+	$_api = new xmlrpc_client('/PLCAPI/', 'planet-lab.org', 443);
+
+  $username = $_SESSION['username'];
+  $password = $_SESSION['password'];
+  
+  $_api->setDebug(0);
+
+  $_api_auth = new xmlrpcval(array(
+				   "AuthMethod" => new xmlrpcval("password"),
+				   "Username" => new xmlrpcval($username),
+				   "AuthString" => new xmlrpcval($password),
+				   "Role" => new xmlrpcval("user")), "struct");
+  
+  $func = new xmlrpcmsg("SliceInfo");
+  $func->addParam($_api_auth);
+
+  $result = $_api->send($func, 15, 'https');
+  
+  if( $result == 0 ) {
+    //    printf("problem: %s\n", $_api->errstring);
+    return 0;
+  }
+  else if($result->faultCode() != 0) {
+    //    printf("server problem: %s\n", $result->errstr);
+    return 0;
+  }
+  else {
+    $result_value = $result->value();
+
+    if( !$result_value ) {
+      //      printf( "didn't get value back from api\n" );
+      return 0;
+    }
+    else {
+      $arr = xmlrpc_decode($result_value);
+      //      printf( "return value success, value %s\n", $val);
+      //      print_r($val);
+      $numElements = count($arr);
+      $i = 0;
+      while ($i < $numElements) {
+		echo "\n";
+		
+		$i++;
+      }
+      return 0;
+    }
+  }
+  */
+	global $api;
+  
+  $slice_list= array();
+  $result= $api->GetSlices( Null, array( "name" ) );
+  sort_slices( $result );
+  foreach ( $result AS $slice )
+  {
+  	echo "