Index: project_release.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project/release/project_release.module,v
retrieving revision 1.66
diff -u -p -r1.66 project_release.module
--- project_release.module	7 Mar 2008 19:35:08 -0000	1.66
+++ project_release.module	16 Mar 2008 22:40:00 -0000
@@ -209,7 +209,7 @@ function project_release_access($op, $no
       // We can't just use project_project_access() here, since we
       // need to check access to the project itself, not the release
       // node, so we use the helper method and pass the project id.
-      return project_check_admin_access($node->pid);
+      return project_check_admin_access($node->project_release['pid']);
     case 'delete':
       // No one should ever delete a release node, only unpublish it.
       return FALSE;
@@ -236,11 +236,12 @@ function project_release_node_info() {
  */
 function project_release_form($release) {
   if (arg(1) == 'add') {
-    $release->pid = arg(3);
-    $project = node_load($release->pid);
+    $release->project_release = array();
+    $release->project_release['pid'] = arg(3);
+    $project = node_load($release->project_release['pid']);
     project_project_set_breadcrumb($project, TRUE);
     if (!isset($project) || $project->type != 'project_project') {
-      drupal_set_message(t('Node !nid is not a valid project.', array('!nid' => $release->pid)));
+      drupal_set_message(t('Node !nid is not a valid project.', array('!nid' => $release->project_reelease['pid'])));
       drupal_not_found();
       module_invoke_all('exit');
       exit;
@@ -262,7 +263,7 @@ function project_release_form($release) 
     global $user;
     $admin = user_access('administer projects');
     $is_edit = true;
-    $project->nid = $release->pid;
+    $project->nid = $release->project_release['pid'];
     $project = node_load($project);
     $breadcrumb[] = l($project->title, 'node/'. $project->nid);
     $breadcrumb[] = l(t('Releases'), 'node/'. $project->nid . '/release');
@@ -286,12 +287,16 @@ function project_release_form($release) 
   }
   _project_release_form_add_text_element($form['rel_id']['title'], t('Title'), $release->title, $is_edit, $admin, true, 40, 128);
   _project_release_form_add_text_element($form['rel_id']['version'], t('Version string'), $release->version, $is_edit, $admin, true, 20, 255);
+  
+  $form['project_release'] = array(
+    '#tree' => TRUE
+  );
 
-  $form['pid'] = array(
+  $form['project_release']['pid'] = array(
     '#type' => 'value',
-    '#value' => $release->pid,
+    '#value' => $release->project_release['pid'],
   );
-  $form['version']['num'] = array(
+  $form['project_release']['version']['num'] = array(
     '#type' => 'fieldset',
     '#title' => t('Version number elements'),
     '#collapsible' => TRUE,
@@ -309,14 +314,14 @@ function project_release_form($release) 
   _project_release_form_add_version_element($form, $release, $modify, $format,
     'extra', t('Extra identifier'), t('Optionally specify other identifying information for this version, for example "beta-1", "rc-1" or "dev". In most cases, this should be left blank.'), 40);
 
-  $form['file'] = array(
+  $form['project_release']['file'] = array(
     '#type' => 'fieldset',
     '#title' => t('File information'),
     '#collapsible' => TRUE,
   );
-  if (empty($release->file_path)) {
+  if (empty($release->project_release['file_path'])) {
     $file = file_check_upload('file');
-    $form['file']['file'] = array(
+    $form['project_release']['file']['file'] = array(
       '#title' => t('File'),
       '#type' => 'file',
       '#description' => ($file ? t('A file named %filename has already been uploaded. If you upload another file %filename will be replaced.', array('%filename' => $file->filename)) : t('Choose the file that will be associated with this release.')),
@@ -339,14 +344,14 @@ function project_release_form($release) 
   );
   $form['body_filter']['format'] = filter_form($release->format);
 
-  _project_release_form_add_text_element($form['tag']['tag'], t('Tag'), $release->tag, $is_edit, $admin, true, 40, 255);
-  $form['tag']['rebuild'] = array(
+  _project_release_form_add_text_element($form['project_release']['tag']['tag'], t('Tag'), $release->project_release['tag'], $is_edit, $admin, true, 40, 255);
+  $form['project_release']['tag']['rebuild'] = array(
     '#type' => 'value',
-    '#value' => $release->rebuild,
+    '#value' => $release->project_release['rebuild'],
   );
-  _project_release_form_add_text_element($form['file']['file_path'], t('File path'), $release->file_path, $is_edit, $admin, false, 40, 255);
-  _project_release_form_add_text_element($form['file']['file_hash'], t('File md5 hash'), $release->file_hash, $is_edit, false);
-  _project_release_form_add_text_element($form['file']['file_date'], t('File date'), $release->file_date, $is_edit, false);
+  _project_release_form_add_text_element($form['project_release']['file']['file_path'], t('File path'), $release->project_release['file_path'], $is_edit, $admin, false, 40, 255);
+  _project_release_form_add_text_element($form['project_release']['file']['file_hash'], t('File md5 hash'), $release->project_release['file_hash'], $is_edit, false);
+  _project_release_form_add_text_element($form['project_release']['file']['file_date'], t('File date'), $release->project_release['file_date'], $is_edit, false);
 
   return $form;
 }
@@ -377,10 +382,10 @@ function _project_release_form_add_versi
   $var_name = 'version_'. $name;
   $regexp = "@.*[!#%]$name.*@";
   if (preg_match($regexp, $format)) {
-    $form['version']['num'][$var_name] = array(
+    $form['project_release']['version']['num'][$var_name] = array(
       '#type' => 'textfield',
       '#title' => $title,
-      '#default_value' => $release->$var_name,
+      '#default_value' => $release->project_release[$var_name],
       '#size' => $size,
       '#maxlength' => $size+10,
       '#attributes' => array('style' => 'width:auto'),
@@ -392,16 +397,16 @@ function _project_release_form_add_versi
       $form[$var_name]['#required'] = TRUE;
     }
     if ($description) {
-      $form['version']['num'][$var_name]['#description'] = $description;
+      $form['project_release']['version']['num'][$var_name]['#description'] = $description;
     }
     if (!$modify) {
-      $form['version']['num'][$var_name]['#attributes'] = array('disabled' => 'disabled');
+      $form['project_release']['version']['num'][$var_name]['#attributes'] = array('disabled' => 'disabled');
     }
   }
   else {
-    $form['version']['num'][$var_name] = array(
+    $form['project_release']['version']['num'][$var_name] = array(
       '#type' => 'value',
-      '#value' => $release->$var_name,
+      '#value' => $release->project_release[$var_name],
     );
   }
 }
@@ -451,19 +456,19 @@ function project_release_validate(&$edit
   global $form_values;
 
   if ($_POST['validate_version']) {
-    if (!isset($edit->version_major) && !isset($edit->version_minor) &&
-        !isset($edit->version_patch) &&
-        (!($edit->version_extra) || $edit->version_extra === '')) {
+    if (!isset($edit->project_release['version']['num']['version_major']) && !isset($edit->project_release['version']['num']['version_minor']) &&
+        !isset($edit->project_release['version']['num']['version_patch']) &&
+        (!($edit->project_release['version']['num']['version_extra']) || $edit->project_release['version']['num']['version_extra'] === '')) {
       form_set_error('version_major', t('You must fill in some version information.'));
       // TODO: find a better form value to mark as the error?
     }
     foreach (array('version_major' => 'Major version number', 'version_minor' => 'Minor version number') as $field => $name) {
-      $val = $edit->$field;
+      $val = $edit->project_release['version']['num'][$field];
       if (isset($val) && $val !== '' && !is_numeric($val)) {
         form_set_error($field, t('!name must be a number.', array('!name' => $name)));
       }
     }
-    $val = $edit->version_patch;
+    $val = $edit->project_release['version']['num']['version_patch'];
     if (isset($val) && $val !== '' && !is_numeric($val) && $val != 'x') {
       form_set_error('version_patch', t("Patch-level version number must be numeric or the letter 'x'."));
     }
@@ -494,7 +499,7 @@ function project_release_validate(&$edit
       $tid = $edit->$vid;
     }
     if (isset($tid) && is_numeric($tid)) {
-      $edit->version_api_tid = $tid;
+      $edit->project_release['version_api_tid'] = $tid;
     }
   }
 
@@ -512,8 +517,8 @@ function project_release_validate(&$edit
   if (isset($edit->project->uri)) {
     $project_name = $edit->project->uri;
   }
-  elseif (isset($edit->pid)) {
-    $project_name = db_result(db_query("SELECT uri FROM {project_projects} WHERE nid = %d", $edit->pid));
+  elseif (isset($edit->project_release['pid'])) {
+    $project_name = db_result(db_query("SELECT uri FROM {project_projects} WHERE nid = %d", $edit->project_release['pid']));
   }
   if (isset($edit->title)) {
     // TODO: Magic re-setting to "%project_name %version" ??
@@ -534,12 +539,12 @@ function project_release_validate(&$edit
  * @ingroup project_release_node
  */
 function project_release_load($node) {
-  $additions = db_fetch_object(db_query("SELECT * FROM {project_release_nodes} WHERE nid = %d", $node->nid));
+  $additions = db_fetch_array(db_query("SELECT * FROM {project_release_nodes} WHERE nid = %d", $node->nid));
   // Add the API term associated with the release.
   $api_vid = _project_release_get_api_vid();
   $api_tid = db_result(db_query("SELECT tn.tid FROM {term_node} tn INNER JOIN {term_data} td ON tn.tid = td.tid WHERE td.vid = %d AND tn.nid = %d", $api_vid, $node->nid));
-  $additions->version_api_tid = $api_tid;
-  return $additions;
+  $additions['version_api_tid'] = $api_tid;
+  return array('project_release' => $additions);
 }
 
 /**
@@ -588,8 +593,8 @@ function project_release_db_save($node, 
 
   // If the patch field is set to a non-numeric value, we just want to
   // keep it as a NULL in the DB, instead of casting it to a 0.
-  if (isset($node->version_patch) && !is_numeric($node->version_patch)) {
-    unset($node->version_patch);
+  if (isset($node->project_release['version']['num']['version_patch']) && !is_numeric($node->project_release['version']['num']['version_patch'])) {
+    unset($node->project_release['version']['num']['version_patch']);
   }
 
   // Handle file upload data.
@@ -601,28 +606,28 @@ function project_release_db_save($node, 
   }
   else {
     // If there's no upload, save whatever value is already in $node.
-    $file_path = $node->file_path;
+    $file_path = $node->project_release['file']['file_path'];
   }
 
   $types = array( 'pid' => "%d", 'version' => "'%s'", 'tag' => "'%s'",
     'file_path' => "'%s'", 'file_date' => "%d", 'file_hash' => "'%s'",
     'rebuild' => "%d",
   );
-  $values = array( 'pid' => $node->pid, 'version' => $node->version,
-    'tag' => $node->tag, 'file_path' => $file_path,
-    'file_date' => $node->file_date, 'file_hash' => $node->file_hash,
-    'rebuild' => $node->rebuild,
+  $values = array( 'pid' => $node->project_release['pid'], 'version' => $node->version,
+    'tag' => $node->project_release['tag']['tag'], 'file_path' => $file_path,
+    'file_date' => $node->project_release['file']['file_date'], 'file_hash' => $node->project_release['file']['file_hash'],
+    'rebuild' => $node->project_release['tag']['rebuild'],
   );
   $fields = array('version_major', 'version_minor', 'version_patch');
   foreach ($fields as $field) {
-    if (isset($node->$field) && is_numeric($node->$field)) {
+    if (isset($node->project_release['version']['num'][$field]) && is_numeric($node->project_release['version']['num'][$field])) {
       $types[$field] = "%d";
-      $values[$field] = $node->$field;
+      $values[$field] = $node->project_release['version']['num'][$field];
     }
   }
-  if (!empty($node->version_extra)) {
+  if (!empty($node->project_release['version']['num']['version_extra'])) {
     $types['version_extra'] = "'%s'";
-    $values['version_extra'] = $node->version_extra;
+    $values['version_extra'] = $node->project_release['version']['num']['version_extra'];
   }
 
   if ($is_new) {
@@ -718,7 +723,7 @@ function project_release_check_supported
  */
 function project_release_delete($node) {
   if ($node->file_path) {
-    file_delete(file_create_path($node->file_path));
+    file_delete(file_create_path($node->project_release['file_path']));
   }
   db_query("DELETE FROM {project_release_nodes} WHERE nid = %d", $node->nid);
 }
@@ -768,15 +773,15 @@ function project_release_get_version($re
     $node = $project;
   }
   else {
-    $node->nid = $release->pid;
+    $node->nid = $release->project_release['pid'];
   }
   $variables = array();
   foreach (array('major', 'minor', 'patch', 'extra') as $field) {
     $var = "version_$field";
     if (isset($release->$var) && $release->$var !== '') {
-      $variables["!$field"] = $release->$var;
-      $variables["%$field"] = '.'. $release->$var;
-      $variables["#$field"] = '-'. $release->$var;
+      $variables["!$field"] = $release->project_release[$var];
+      $variables["%$field"] = '.'. $release->project_release[$var];
+      $variables["#$field"] = '-'. $release->project_release[$var];
     }
     else {
       $variables["!$field"] = '';
@@ -812,7 +817,7 @@ function project_release_get_version($re
  */
 function project_release_view($node, $teaser = FALSE, $page = FALSE) {
   $node = node_prepare($node, $teaser);
-  $project = node_load($node->pid);
+  $project = node_load($node->project_release['pid']);
 
   if ($page) {
     // Breadcrumb navigation
@@ -822,25 +827,25 @@ function project_release_view($node, $te
   }
 
   $output = '';
-  if (project_use_cvs($project) && isset($node->tag)) {
-    if ($node->rebuild) {
-      $output .= t('Nightly development snapshot from CVS branch: @tag', array('@tag' => $node->tag)) .'<br />';
+  if (project_use_cvs($project) && isset($node->project_release['tag'])) {
+    if ($node->project_release['rebuild']) {
+      $output .= t('Nightly development snapshot from CVS branch: @tag', array('@tag' => $node->project_release['tag'])) .'<br />';
     }
     else {
-      $output .= t('Official release from CVS tag: @tag', array('@tag' => $node->tag)) .'<br />';
+      $output .= t('Official release from CVS tag: @tag', array('@tag' => $node->project_release['tag'])) .'<br />';
     }
   }
 
-  if ($node->file_path) {
-    $output .= '<small>'. t('Download: !file', array('!file' => theme('project_release_download_link', $node->file_path))) .'</small><br />';
-    $output .= '<small>'. t('Size: !size', array('!size' => format_size(filesize(file_create_path($node->file_path))))) .'</small><br />';
-    $output .= '<small>'. t('md5_file hash: !file_hash', array('!file_hash' => $node->file_hash)) .'</small><br />';
+  if ($node->project_release['file_path']) {
+    $output .= '<small>'. t('Download: !file', array('!file' => theme('project_release_download_link', $node->project_release['file_path']))) .'</small><br />';
+    $output .= '<small>'. t('Size: !size', array('!size' => format_size(filesize(file_create_path($node->project_release['file_path']))))) .'</small><br />';
+    $output .= '<small>'. t('md5_file hash: !file_hash', array('!file_hash' => $node->project_release['file_hash'])) .'</small><br />';
   }
   if ($node->created) {
     $output .= '<small>'. t('First released: !created', array('!created' => format_date($node->created))) .'</small><br />';
   }
   if ($node->file_date  && ($node->file_date != $node->created)) {
-    $output .= '<small>'. t('Last updated: !changed', array('!changed' => format_date($node->file_date))) .'</small><br />';
+    $output .= '<small>'. t('Last updated: !changed', array('!changed' => format_date($node->project_release['file_date']))) .'</small><br />';
   }
   $node->content['release_info'] = array(
     '#value' => '<div class="project-release">'. $output .'</div>',
@@ -848,7 +853,7 @@ function project_release_view($node, $te
   );
 
   // Display packaging errors to admins.
-  if (project_check_admin_access($node->pid)) {
+  if (project_check_admin_access($node->project_release['pid'])) {
     $rows = array();
     $result = db_query('SELECT * FROM {project_release_package_errors} WHERE nid = %d', $node->nid);
     $error = db_fetch_object($result);
@@ -909,7 +914,7 @@ function project_release_get_releases($p
       $releases[$obj->nid] = node_load($obj->nid);
     }
     else {
-      $releases[$obj->nid] = $obj->version;
+      $releases[$obj->nid] = $obj->project_release['version'];
     }
   }
   return $releases;
@@ -1357,15 +1362,15 @@ function project_release_project_edit_fo
 function project_release_alter_release_form(&$form) {
   global $user;
   $node = $form['#node'];
-  $tid = $node->version_api_tid;
+  $tid = $node->project_release['version_api_tid'];
   $vid = _project_release_get_api_vid();
   if (!project_release_get_api_taxonomy() && isset($form['taxonomy'][$vid])) {
     unset($form['taxonomy'][$vid]);
   }
   else {
 /*
-    if (isset($node->pid)) {
-      $project->nid = $node->pid;
+    if (isset($node->project_release['pid'])) {
+      $project->nid = $node->project_release['pid'];
     }
     elseif (arg(1) == 'add' && is_numeric(arg(3))) {
       $project->nid = arg(3);
@@ -1487,8 +1492,8 @@ function project_release_release_nodeapi
       // Since release nodes can be unpublished, we need to make sure that the
       // recommended branch information is still up to date.
       if (module_exists('taxonomy')) {
-        if (isset($node->version_api_tid)) {
-          $tid = $node->version_api_tid;
+        if (isset($node->project_release['version_api_tid'])) {
+          $tid = $node->project_release['version_api_tid'];
         }
         else {
           $vid = _project_release_get_api_vid();
@@ -1497,13 +1502,13 @@ function project_release_release_nodeapi
           }
         }
         if (isset($tid)) {
-          project_release_check_supported_versions($node->pid, $tid, $node->version_major, ($op == 'delete' ? TRUE : FALSE));
+          project_release_check_supported_versions($node->project_release['pid'], $tid, $node->project_release['version_major'], ($op == 'delete' ? TRUE : FALSE));
         }
       }
 
       // Finally, clear the cache for the release table on any of these node
       // operations, since what we want to display might have changed, too.
-      $cid = 'table:'. $node->pid .':';
+      $cid = 'table:'. $node->project_release['pid'] .':';
       cache_clear_all($cid, 'cache_project_release', TRUE);
       break;
   }