'. t('This module was created by Jamie Ruderman for Marmot Mountain LLC,
+ and was based on directions posted at drupal.org
+ How to create your own simple node type (Drupal 4.7)',
+ array('%tutorial' => 'http://www.drupal.org/node/40684')) .'
';
+ return $output;
+ case 'admin/modules#description':
+ return t('Enables the creation of pages to display, browse, upload and delete files.');
+ case 'node/add#fileshare':
+ return t('Create a Fileshare page.');
+ }
+}
+
+/**
* Implementation of hook_node_info().
*
* This is a required node hook. This function describes the nodes provided by
@@ -27,7 +63,7 @@
* when inserting the node).
*/
function fileshare_node_info() {
- return array('fileshare' => array('name' => t('fileshare'), 'module' => 'fileshare', 'description' => 'Create a Fileshare page.'));
+ return array('fileshare' => array('name' => t('fileshare'), 'base' => 'fileshare'));
}
/**
@@ -280,16 +316,18 @@ function fileshare_update($node) {
fileshare_insert($node);
} else {
// convert and sanitize node title as directory name
- $rename = '/'._sanitize_filename($node->title).$node->nid;
- if ($node->_filepath != $rename) {
- if (!rename($node->_basepath.$node->_filepath, $node->_basepath.$rename)) {
- die('RENAMING ERROR - from "'.$node->_basepath.$node->_filepath.'" to "'.$node->_basepath.$rename.'".');
+ $orig = node_load($node->nid);
+
+ if ($node->_filepath != $orig->_filepath) {
+ if (!rename($orig->_basepath.$orig->_filepath, $node->_basepath.$node->_filepath)) {
+ drupal_set_message('RENAMING ERROR - from "'.$orig->_basepath.$orig->_filepath.'" to "'.$node->_basepath.$node->_filepath.'".', 'error');
+ return false;
}
}
- $node->_filepath = $rename;
db_query("UPDATE {node_fileshare} SET _filepath = '%s', _basepath = '%s', _whitelist = '%s', _method = %b, _modify = %b, _thumbs = %b, _private = %b WHERE vid = %d",
$node->_filepath, $node->_basepath, $node->_whitelist, $node->_method, $node->_modify, $node->_thumbs, $node->_private, $node->vid);
}
+ return true;
}
/**
@@ -318,7 +356,7 @@ function fileshare_delete($node) {
db_query('DELETE FROM {node_fileshare} WHERE nid = %d', $node->nid);
if (_recursive_rmdir($node->_basepath.$node->_filepath)) {
drupal_set_message('The directory: "'.$node->_basepath.$node->_filepath.'" has been deleted.');
- watchdog('fileshare', check_plain($node->title." and the contents of ".$node->_basepath.$node->_filepath." were deleted"), WATCHDOG_NOTICE, l(t('view'), 'node/'.$node->nid));
+ watchdog('fileshare', $node->title." and the contents of ".$node->_basepath.$node->_filepath." were deleted", WATCHDOG_NOTICE, l(t('view'), 'node/'.$node->nid));
} else {
drupal_set_message('ERROR: "'.$node->_basepath.$node->_filepath.'" could not be deleted.','error');
}
@@ -346,12 +384,8 @@ function fileshare_load($node) {
function fileshare_view(&$node, $teaser = FALSE, $page = FALSE) {
$node = node_prepare($node, $teaser);
$order_info = theme('fileshare_order_info', $node);
- if ($teaser) {
- $node->content['teaser']['#value'] .= $order_info;
- } elseif ($page) {
- $node->content['body']['#value'] .= $order_info;
- }
- return $node;
+ $node->body .= $order_info;
+ $node->teaser .= $order_info;
}
/**
@@ -367,24 +401,23 @@ function theme_fileshare_order_info($nod
$output .= '';
$output .= '