changed mail functions and formated the code

1 files changed, 179 insertions, 198 deletions

diff --git a/dependency.inc b/dependency.inc
index 0137ca4..a507218 100755
--- a/dependency.inc
+++ b/dependency.inc
@@ -1,214 +1,195 @@
 <?php
 // $Id$
-
-function lab_migration_upload_dependency_form($form_state)
-{
-  global $user;
-
-  $proposal_data = lab_migration_get_proposal();
-  if (!$proposal_data) {
-      drupal_goto('');
-      return;
-  }
-
-  $form['#attributes'] = array('enctype' => "multipart/form-data");
-
-  $form['lab_title'] = array(
-    '#type' => 'item',
-    '#value' => $proposal_data->lab_title,
-    '#title' => t('Title of the Lab'),
-  );
-  $form['name'] = array(
-    '#type' => 'item',
-    '#value' => $proposal_data->name_title . ' ' . $proposal_data->name,
-    '#title' => t('Proposer Name'),
-  );
-
-  $form['existing_depfile'] = array(
-    '#type' => 'item',
-    '#value' => _list_existing_dependency($proposal_data->id),
-    '#title' => t('List of existing dependency files for this book'),
-  );
-
-  $form['depfile'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Upload Dependency Files'),
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE,
-  );
-  $form['depfile']['depfile1'] = array(
-    '#type' => 'file',
-    '#title' => t('Upload dependency file'),
-    '#description' => t("Allowed file extensions : ") . variable_get('lab_migration_dependency_extensions', ''),
-  );
-  $form['depfile']['depfile1_caption'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Caption for dependency file'),
-    '#size' => 15,
-    '#maxlength' => 100,
-    '#required' => TRUE,
-  );
-  $form['depfile']['depfile1_description'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Brief Description of the dependency file'),
-  );
-
-  $form['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Submit')
-  );
-
-  $form['cancel'] = array(
-    '#type' => 'markup',
-    '#value' => l(t('Back'), 'lab_migration/code'),
-  );
-  return $form;
-}
-
-function lab_migration_upload_dependency_form_validate($form, &$form_state)
-{
-  global $user;
-
-  /* get approved proposal details */
-  //$proposal_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE uid = %d OR solution_provider_uid = %d ORDER BY id DESC LIMIT 1", $user->uid, $user->uid);
-  $query = db_select('lab_migration_proposal');
-            $query->fields('lab_migration_proposal');
-
-            $or = db_or();
-            $or->condition('uid', $user->uid);
-            $or->condition('solution_provider_uid', $user->uid);
-            $query->condition($or);
-            $query->orderBy('id', 'DESC');
-            $query->range(0, 1);
-            $proposal_q = $query->execute();
-  $proposal_data = $proposal_q->fetchObject();
-  if (!$proposal_data)
+function lab_migration_upload_dependency_form($form, $form_state)
   {
-  	form_set_error('', t('Invalid1'));
+    global $user;
+    $proposal_data = lab_migration_get_proposal();
+    if (!$proposal_data)
+      {
+        drupal_goto('');
+        return;
+      }
+    $form['#attributes'] = array(
+        'enctype' => "multipart/form-data"
+    );
+    $form['lab_title'] = array(
+        '#type' => 'item',
+        '#value' => $proposal_data->lab_title,
+        '#title' => t('Title of the Lab')
+    );
+    $form['name'] = array(
+        '#type' => 'item',
+        '#value' => $proposal_data->name_title . ' ' . $proposal_data->name,
+        '#title' => t('Proposer Name')
+    );
+    $form['existing_depfile'] = array(
+        '#type' => 'item',
+        '#value' => _list_existing_dependency($proposal_data->id),
+        '#title' => t('List of existing dependency files for this book')
+    );
+    $form['depfile'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Upload Dependency Files'),
+        '#collapsible' => FALSE,
+        '#collapsed' => FALSE
+    );
+    $form['depfile']['depfile1'] = array(
+        '#type' => 'file',
+        '#title' => t('Upload dependency file'),
+        '#description' => t("Allowed file extensions : ") . variable_get('lab_migration_dependency_extensions', '')
+    );
+    $form['depfile']['depfile1_caption'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Caption for dependency file'),
+        '#size' => 15,
+        '#maxlength' => 100,
+        '#required' => TRUE
+    );
+    $form['depfile']['depfile1_description'] = array(
+        '#type' => 'textarea',
+        '#title' => t('Brief Description of the dependency file')
+    );
+    $form['submit'] = array(
+        '#type' => 'submit',
+        '#value' => t('Submit')
+    );
+    $form['cancel'] = array(
+        '#type' => 'markup',
+        '#value' => l(t('Back'), 'lab_migration/code')
+    );
+    return $form;
   }
-
-  if (!lab_migration_check_name($form_state['values']['depfile1_caption']))
-    form_set_error('code_caption', t('Caption can contain only alphabets, numbers and spaces.'));
-
-  if (isset($_FILES['files']))
+function lab_migration_upload_dependency_form_validate($form, &$form_state)
   {
-    /* check for valid filename extensions */  
-    $allowed_extensions = explode(',' , variable_get('lab_migration_dependency_extensions', ''));
-    foreach ($_FILES['files']['name'] as $file_form_name => $file_name)
-    {
-      if ($file_name)
+    global $user;
+    /* get approved proposal details */
+    //$proposal_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE uid = %d OR solution_provider_uid = %d ORDER BY id DESC LIMIT 1", $user->uid, $user->uid);
+    $query = db_select('lab_migration_proposal');
+    $query->fields('lab_migration_proposal');
+    $or = db_or();
+    $or->condition('uid', $user->uid);
+    $or->condition('solution_provider_uid', $user->uid);
+    $query->condition($or);
+    $query->orderBy('id', 'DESC');
+    $query->range(0, 1);
+    $proposal_q = $query->execute();
+    $proposal_data = $proposal_q->fetchObject();
+    if (!$proposal_data)
       {
-         $temp_extension = end(explode('.', strtolower($_FILES['files']['name'][$file_form_name])));
-         if (!in_array($temp_extension, $allowed_extensions))
-           form_set_error($file_form_name, t('Only ' . variable_get('lab_migration_dependency_extensions', '') . ' extensions can be uploaded.'));
-         if ($_FILES['files']['size'][$file_form_name] <= 0)
-           form_set_error($file_form_name, t('File size cannot be zero.'));
-
-         /* check if file already exists */
-         //$dep_exists_data = (db_query("SELECT * FROM {lab_migration_dependency_files} WHERE filename = '%s'", $_FILES['files']['name'][$file_form_name]))->fetchObject();
-         $query = db_select('lab_migration_dependency_files');
-                    $query->fields('lab_migration_dependency_files');
-                    $query->condition('filename', $_FILES['files']['name'][$file_form_name]);
-                    $dep_exists_data = $query->execute();
-         if ($dep_exists_data)
-           form_set_error($file_form_name, t('Dependency file with the same name has already been uploaded in this or some other lab solution. Please rename the file and try again.'));
-
-         /* check if valid file name */
-         if (!lab_migration_check_valid_filename($_FILES['files']['name'][$file_form_name]))
-           form_set_error($file_form_name, t('Invalid file name specified. Only alphabets, numbers and underscore is allowed as a valid filename.'));
+        form_set_error('', t('Invalid1'));
+      }
+    if (!lab_migration_check_name($form_state['values']['depfile1_caption']))
+        form_set_error('code_caption', t('Caption can contain only alphabets, numbers and spaces.'));
+    if (isset($_FILES['files']))
+      {
+        /* check for valid filename extensions */
+        $allowed_extensions = explode(',', variable_get('lab_migration_dependency_extensions', ''));
+        foreach ($_FILES['files']['name'] as $file_form_name => $file_name)
+          {
+            if ($file_name)
+              {
+                $temp_extension = end(explode('.', strtolower($_FILES['files']['name'][$file_form_name])));
+                if (!in_array($temp_extension, $allowed_extensions))
+                    form_set_error($file_form_name, t('Only ' . variable_get('lab_migration_dependency_extensions', '') . ' extensions can be uploaded.'));
+                if ($_FILES['files']['size'][$file_form_name] <= 0)
+                    form_set_error($file_form_name, t('File size cannot be zero.'));
+                /* check if file already exists */
+                //$dep_exists_data = (db_query("SELECT * FROM {lab_migration_dependency_files} WHERE filename = '%s'", $_FILES['files']['name'][$file_form_name]))->fetchObject();
+                $query = db_select('lab_migration_dependency_files');
+                $query->fields('lab_migration_dependency_files');
+                $query->condition('filename', $_FILES['files']['name'][$file_form_name]);
+                $dep_exists_data = $query->execute();
+                if ($dep_exists_data)
+                    form_set_error($file_form_name, t('Dependency file with the same name has already been uploaded in this or some other lab solution. Please rename the file and try again.'));
+                /* check if valid file name */
+                if (!lab_migration_check_valid_filename($_FILES['files']['name'][$file_form_name]))
+                    form_set_error($file_form_name, t('Invalid file name specified. Only alphabets, numbers and underscore is allowed as a valid filename.'));
+              }
+          }
       }
-    }
-  }
-}
-
-function lab_migration_upload_dependency_form_submit($form, &$form_state) {
-  global $user;
-
-  $root_path = lab_migration_path();
-
-  $proposal_data = lab_migration_get_proposal();
-  if (!$proposal_data) {
-      drupal_goto('');
-      return;
   }
-
-  $dest_path .= 'DEPENDENCIES' . '/';
-  if (!is_dir($root_path . $dest_path))
-    mkdir($root_path . $dest_path);
-
-  /* uploading dependencies */
-  $file_upload_counter = 0;
-  $dependency_ids = array();
-  $dependency_names = array();
-
-  foreach ($_FILES['files']['name'] as $file_form_name => $file_name)
+function lab_migration_upload_dependency_form_submit($form, &$form_state)
   {
-    if ($file_name)
-    {
-      /* uploading file */
-      if (move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name]))
+    global $user;
+    $root_path = lab_migration_path();
+    $proposal_data = lab_migration_get_proposal();
+    if (!$proposal_data)
       {
-        /* for uploaded files making an entry in the database */
-        $query = "INSERT INTO {lab_migration_dependency_files} (proposal_id, filename, filepath, filemime, filesize, caption, description, timestamp)
+        drupal_goto('');
+        return;
+      }
+    $dest_path .= 'DEPENDENCIES' . '/';
+    if (!is_dir($root_path . $dest_path))
+        mkdir($root_path . $dest_path);
+    /* uploading dependencies */
+    $file_upload_counter = 0;
+    $dependency_ids = array();
+    $dependency_names = array();
+    foreach ($_FILES['files']['name'] as $file_form_name => $file_name)
+      {
+        if ($file_name)
+          {
+            /* uploading file */
+            if (move_uploaded_file($_FILES['files']['tmp_name'][$file_form_name], $root_path . $dest_path . $_FILES['files']['name'][$file_form_name]))
+              {
+                /* for uploaded files making an entry in the database */
+                $query = "INSERT INTO {lab_migration_dependency_files} (proposal_id, filename, filepath, filemime, filesize, caption, description, timestamp)
           VALUES (:proposal_id, :filename, :filepath, :filemime, :filesize, :caption, :description, :timestamp)";
-          $args = array(
-                        ":proposal_id" => $proposal_data->id,
-                        ":filename" => $_FILES['files']['name'][$file_form_name],
-                        ":filepath" => $dest_path . $_FILES['files']['name'][$file_form_name],
-                        ":filemime" => $_FILES['files']['type'][$file_form_name],
-                        ":filesize" => $_FILES['files']['size'][$file_form_name],
-                        ":caption" => check_plain($form_state['values'][$file_form_name . '_caption']),
-                        ":description" => check_plain($form_state['values'][$file_form_name . '_description']),
-                        ":timestamp" => time()
-          );
-        $dependency_ids[] = db_query($query, $args, array('return' => Database::RETURN_INSERT_ID));  
-        drupal_set_message($file_name . ' uploaded successfully.', 'status');        
-        $dependency_names[] =  $_FILES['files']['name'][$file_form_name];
-        $file_upload_counter++;
-      } else {
-        drupal_set_message('Error uploading dependency : ' . $dest_path . $_FILES['files']['name'][$file_form_name], 'error');
+                $args = array(
+                    ":proposal_id" => $proposal_data->id,
+                    ":filename" => $_FILES['files']['name'][$file_form_name],
+                    ":filepath" => $dest_path . $_FILES['files']['name'][$file_form_name],
+                    ":filemime" => $_FILES['files']['type'][$file_form_name],
+                    ":filesize" => $_FILES['files']['size'][$file_form_name],
+                    ":caption" => check_plain($form_state['values'][$file_form_name . '_caption']),
+                    ":description" => check_plain($form_state['values'][$file_form_name . '_description']),
+                    ":timestamp" => time()
+                );
+                $dependency_ids[] = db_query($query, $args, array(
+                    'return' => Database::RETURN_INSERT_ID
+                ));
+                drupal_set_message($file_name . ' uploaded successfully.', 'status');
+                $dependency_names[] = $_FILES['files']['name'][$file_form_name];
+                $file_upload_counter++;
+              }
+            else
+              {
+                drupal_set_message('Error uploading dependency : ' . $dest_path . $_FILES['files']['name'][$file_form_name], 'error');
+              }
+          }
       }
-    }
-  }
-
-  if ($file_upload_counter > 0)
-  {
-    drupal_set_message('Dependencies uploaded successfully.', 'status');
-  
-    /* sending email */
-    $param['dependency_uploaded']['user_id'] = $user->uid;
-    $param['dependency_uploaded']['dependency_names'] = $dependency_names;
-
-    $email_to = $user->mail . ', ' . variable_get('lab_migration_emails', '');
-    if (!drupal_mail('lab_migration', 'dependency_uploaded', $email_to, language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE))
-      drupal_set_message('Error sending email message.', 'error');
+    if ($file_upload_counter > 0)
+      {
+        drupal_set_message('Dependencies uploaded successfully.', 'status');
+        /* sending email */
+        $param['dependency_uploaded']['user_id'] = $user->uid;
+        $param['dependency_uploaded']['dependency_names'] = $dependency_names;
+        $email_to = $user->mail . ', ' . variable_get('lab_migration_emails', '');
+        if (!drupal_mail('lab_migration', 'dependency_uploaded', $email_to, language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE))
+            drupal_set_message('Error sending email message.', 'error');
+      }
+    drupal_goto('lab-migration/code/upload-dep');
   }
-
-  drupal_goto('lab_migration/code/upload_dep');
-}
-
 function _list_existing_dependency($proposal_id)
-{
-  $return_html = '<ul>';
- // $proposal_dependency_files_q = db_query("SELECT * FROM {lab_migration_dependency_files} WHERE proposal_id = %d ORDER BY filename ASC", $proposal_id);
-  $query = db_select('lab_migration_dependency_files');
-$query->fields('lab_migration_dependency_files');
-$query->condition('proposal_id', $proposal_id);
-$query->orderBy('filename', 'ASC');
-$proposal_dependency_files_q = $query->execute();
-
-  $counter = 0;
-  while ($proposal_dependency_files_data = $proposal_dependency_files_q->fetchObject())
   {
-    $temp_caption = '';
-    if ($proposal_dependency_files_data->caption)
-      $temp_caption = ' (' . $proposal_dependency_files_data->caption . ')';
-    $return_html .= '<li>' . l($proposal_dependency_files_data->filename . $temp_caption, 'lab_migration/download/dependency/' . $proposal_dependency_files_data->id) . '</li>';
-    $counter++;
+    $return_html = '<ul>';
+    // $proposal_dependency_files_q = db_query("SELECT * FROM {lab_migration_dependency_files} WHERE proposal_id = %d ORDER BY filename ASC", $proposal_id);
+    $query = db_select('lab_migration_dependency_files');
+    $query->fields('lab_migration_dependency_files');
+    $query->condition('proposal_id', $proposal_id);
+    $query->orderBy('filename', 'ASC');
+    $proposal_dependency_files_q = $query->execute();
+    $counter = 0;
+    while ($proposal_dependency_files_data = $proposal_dependency_files_q->fetchObject())
+      {
+        $temp_caption = '';
+        if ($proposal_dependency_files_data->caption)
+            $temp_caption = ' (' . $proposal_dependency_files_data->caption . ')';
+        $return_html .= '<li>' . l($proposal_dependency_files_data->filename . $temp_caption, 'lab-migration/download/dependency/' . $proposal_dependency_files_data->id) . '</li>';
+        $counter++;
+      }
+    if ($counter == 0)
+        $return_html .= '<li>(None)</li>';
+    $return_html .= '</ul>';
+    return $return_html;
   }
-  if ($counter == 0)
-    $return_html .= '<li>(None)</li>';
-  $return_html .= '</ul>';
-  return $return_html;
-}
-