changed mail functions and formated the code

1 files changed, 357 insertions, 240 deletions

diff --git a/manage_proposal.inc b/manage_proposal.inc
index 90ab732..fe013cc 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 function lab_migration_proposal_pending()
-{
+  {
     /* get pending proposals to be approved */
     $pending_rows = array();
     //$pending_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE approval_status = 0 ORDER BY id DESC");
@@ -10,7 +10,8 @@ function lab_migration_proposal_pending()
     $query->condition('approval_status', 0);
     $query->orderBy('id', 'DESC');
     $pending_q = $query->execute();
-    while ($pending_data = $pending_q->fetchObject()) {
+    while ($pending_data = $pending_q->fetchObject())
+      {
         $pending_rows[$pending_data->id] = array(
             date('d-m-Y', $pending_data->creation_date),
             l($pending_data->name, 'user/' . $pending_data->uid),
@@ -18,12 +19,13 @@ function lab_migration_proposal_pending()
             $pending_data->department,
             l('Approve', 'lab-migration/manage-proposal/approve/' . $pending_data->id) . ' | ' . l('Edit', 'lab-migration/manage-proposal/edit/' . $pending_data->id)
         );
-    }
+      }
     /* check if there are any pending proposals */
-    if (!$pending_rows) {
+    if (!$pending_rows)
+      {
         drupal_set_message(t('There are no pending proposals.'), 'status');
         return '';
-    }
+      }
     $pending_header = array(
         'Date of Submission',
         'Name',
@@ -37,9 +39,9 @@ function lab_migration_proposal_pending()
         'rows' => $pending_rows
     ));
     return $output;
-}
+  }
 function lab_migration_proposal_pending_solution()
-{
+  {
     /* get pending proposals to be approved */
     $pending_rows = array();
     //$pending_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE approval_status = 1 ORDER BY id DESC");
@@ -48,7 +50,8 @@ function lab_migration_proposal_pending_solution()
     $query->condition('approval_status', 1);
     $query->orderBy('id', 'DESC');
     $pending_q = $query->execute();
-    while ($pending_data = $pending_q->fetchObject()) {
+    while ($pending_data = $pending_q->fetchObject())
+      {
         $pending_rows[$pending_data->id] = array(
             date('d-m-Y', $pending_data->creation_date),
             date('d-m-Y', $pending_data->approval_date),
@@ -57,12 +60,13 @@ function lab_migration_proposal_pending_solution()
             $pending_data->department,
             l('Status', 'lab-migration/manage-proposal/status/' . $pending_data->id)
         );
-    }
+      }
     /* check if there are any pending proposals */
-    if (!$pending_rows) {
+    if (!$pending_rows)
+      {
         drupal_set_message(t('There are no proposals pending for solutions.'), 'status');
         return '';
-    }
+      }
     $pending_header = array(
         'Date of Submission',
         'Date of Approval',
@@ -76,9 +80,9 @@ function lab_migration_proposal_pending_solution()
         'rows' => $pending_rows
     ));
     return $output;
-}
+  }
 function lab_migration_proposal_all()
-{
+  {
     /* get pending proposals to be approved */
     $proposal_rows = array();
     //$proposal_q = db_query("SELECT * FROM {lab_migration_proposal} ORDER BY id DESC");
@@ -86,9 +90,11 @@ function lab_migration_proposal_all()
     $query->fields('lab_migration_proposal');
     $query->orderBy('id', 'DESC');
     $proposal_q = $query->execute();
-    while ($proposal_data = $proposal_q->fetchObject()) {
+    while ($proposal_data = $proposal_q->fetchObject())
+      {
         $approval_status = '';
-        switch ($proposal_data->approval_status) {
+        switch ($proposal_data->approval_status)
+        {
             case 0:
                 $approval_status = 'Pending';
                 break;
@@ -113,12 +119,13 @@ function lab_migration_proposal_all()
             $approval_status,
             l('Status', 'lab-migration/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'lab-migration/manage-proposal/edit/' . $proposal_data->id)
         );
-    }
+      }
     /* check if there are any pending proposals */
-    if (!$proposal_rows) {
+    if (!$proposal_rows)
+      {
         drupal_set_message(t('There are no proposals.'), 'status');
         return '';
-    }
+      }
     $proposal_header = array(
         'Date of Submission',
         'Name',
@@ -132,9 +139,9 @@ function lab_migration_proposal_all()
         'rows' => $proposal_rows
     ));
     return $output;
-}
+  }
 function lab_migration_category_all()
-{
+  {
     /* get pending proposals to be approved */
     $proposal_rows = array();
     // $proposal_q = db_query("SELECT * FROM {lab_migration_proposal} ORDER BY id DESC");
@@ -142,7 +149,8 @@ function lab_migration_category_all()
     $query->fields('lab_migration_proposal');
     $query->orderBy('id', 'DESC');
     $proposal_q = $query->execute();
-    while ($proposal_data = $proposal_q->fetchObject()) {
+    while ($proposal_data = $proposal_q->fetchObject())
+      {
         $proposal_rows[] = array(
             date('d-m-Y', $proposal_data->creation_date),
             l($proposal_data->name, 'user/' . $proposal_data->uid),
@@ -151,7 +159,7 @@ function lab_migration_category_all()
             $proposal_data->category,
             l('Edit Category', 'lab-migration/manage-proposal/category/edit/' . $proposal_data->id)
         );
-    }
+      }
     $proposal_header = array(
         'Date of Submission',
         'Name',
@@ -165,12 +173,12 @@ function lab_migration_category_all()
         'rows' => $proposal_rows
     ));
     return $output;
-}
+  }
 /******************************************************************************/
 /************************** PROPOSAL APPROVAL FORM ****************************/
 /******************************************************************************/
 function lab_migration_proposal_approval_form($form, $form_state)
-{
+  {
     global $user;
     /* get current proposal */
     $proposal_id = (int) arg(3);
@@ -179,19 +187,25 @@ function lab_migration_proposal_approval_form($form, $form_state)
     $query->fields('lab_migration_proposal');
     $query->condition('id', $proposal_id);
     $proposal_q = $query->execute();
-    if ($proposal_q) {
-        if ($proposal_data = $proposal_q->fetchObject()) {
+    if ($proposal_q)
+      {
+        if ($proposal_data = $proposal_q->fetchObject())
+          {
             /* everything ok */
-        } else {
+          }
+        else
+          {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
             drupal_goto('lab-migration/manage-proposal');
             return;
-        }
-    } else {
+          }
+      }
+    else
+      {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
+      }
     // var_dump($proposal_data->name_title);
     //    die;
     $form['name'] = array(
@@ -252,26 +266,32 @@ function lab_migration_proposal_approval_form($form, $form_state)
     $query->condition('proposal_id', $proposal_id);
     $query->orderBy('id', 'ASC');
     $experiment_q = $query->execute();
-    while ($experiment_data = $experiment_q->fetchObject()) {
+    while ($experiment_data = $experiment_q->fetchObject())
+      {
         $experiment_list .= '<li>' . $experiment_data->title . '</li>Description of Experiment : ' . $experiment_data->description . '<br>';
-    }
+      }
     $experiment_list .= '</ul>';
     $form['experiment'] = array(
         '#type' => 'item',
         '#markup' => $experiment_list,
         '#title' => t('Experiments')
     );
-    if ($proposal_data->solution_provider_uid == 0) {
+    if ($proposal_data->solution_provider_uid == 0)
+      {
         $solution_provider = "User will not provide solution, we will have to provide solution";
-    } else if ($proposal_data->solution_provider_uid == $proposal_data->uid) {
+      }
+    else if ($proposal_data->solution_provider_uid == $proposal_data->uid)
+      {
         $solution_provider = "Proposer will provide the solution of the lab";
-    } else {
+      }
+    else
+      {
         $solution_provider_user_data = user_load($proposal_data->solution_provider_uid);
         if ($solution_provider_user_data)
             $solution_provider = "Solution will be provided by user " . l($solution_provider_user_data->name, 'user/' . $proposal_data->solution_provider_uid);
         else
             $solution_provider = "User does not exists";
-    }
+      }
     $form['solution_provider_uid'] = array(
         '#type' => 'item',
         '#title' => t('Do you want to provide the solution'),
@@ -316,17 +336,19 @@ function lab_migration_proposal_approval_form($form, $form_state)
         '#markup' => l(t('Cancel'), 'lab-migration/manage-proposal')
     );
     return $form;
-}
+  }
 function lab_migration_proposal_approval_form_validate($form, &$form_state)
-{
-    if ($form_state['values']['approval'] == 2) {
-        if ($form_state['values']['message'] == '') {
+  {
+    if ($form_state['values']['approval'] == 2)
+      {
+        if ($form_state['values']['message'] == '')
+          {
             form_set_error('message', t('Reason for disapproval could not be empty'));
-        }
-    }
-}
+          }
+      }
+  }
 function lab_migration_proposal_approval_form_submit($form, &$form_state)
-{
+  {
     global $user;
     /* get current proposal */
     $proposal_id = (int) arg(3);
@@ -335,20 +357,27 @@ function lab_migration_proposal_approval_form_submit($form, &$form_state)
     $query->fields('lab_migration_proposal');
     $query->condition('id', $proposal_id);
     $proposal_q = $query->execute();
-    if ($proposal_q) {
-        if ($proposal_data = $proposal_q->fetchObject()) {
+    if ($proposal_q)
+      {
+        if ($proposal_data = $proposal_q->fetchObject())
+          {
             /* everything ok */
-        } else {
+          }
+        else
+          {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
             drupal_goto('lab-migration/manage-proposal');
             return;
-        }
-    } else {
+          }
+      }
+    else
+      {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
-    if ($form_state['values']['approval'] == 1) {
+      }
+    if ($form_state['values']['approval'] == 1)
+      {
         $query = "UPDATE {lab_migration_proposal} SET approver_uid = :uid, approval_date = :date, approval_status = 1, solution_status = 2 WHERE id = :proposal_id";
         $args = array(
             ":uid" => $user->uid,
@@ -356,28 +385,31 @@ function lab_migration_proposal_approval_form_submit($form, &$form_state)
             ":proposal_id" => $proposal_id
         );
         db_query($query, $args);
-         /* sending email */
-    $user_data = user_load($proposal_data->uid);
-    $email_to = $user_data->mail;
-
-    $from = variable_get('lab_migration_from_email', '');
-    $bcc= $user->mail . ', ' .variable_get('lab_migration_emails', '');
-    $cc=variable_get('lab_migration_cc_emails', '');
-
-    $param['proposal_approved']['proposal_id'] = $proposal_id;
-    $param['proposal_approved']['user_id'] = $proposal_data->uid;
-    $param['proposal_approved']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
-    			'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
-    			'Content-Transfer-Encoding' => '8Bit',
-    			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
-    
-    if(!drupal_mail('lab_migration', 'proposal_approved', $email_to,  language_default(), $param, $from, TRUE))
-      drupal_set_message('Error sending email message.', 'error');
-       
+        /* sending email */
+        $user_data = user_load($proposal_data->uid);
+        $email_to = $user_data->mail;
+        $from = variable_get('lab_migration_from_email', '');
+        $bcc = $user->mail . ', ' . variable_get('lab_migration_emails', '');
+        $cc = variable_get('lab_migration_cc_emails', '');
+        $param['proposal_approved']['proposal_id'] = $proposal_id;
+        $param['proposal_approved']['user_id'] = $proposal_data->uid;
+        $param['proposal_approved']['headers'] = array(
+            'From' => $from,
+            'MIME-Version' => '1.0',
+            'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+            'Content-Transfer-Encoding' => '8Bit',
+            'X-Mailer' => 'Drupal',
+            'Cc' => $cc,
+            'Bcc' => $bcc
+        );
+        if (!drupal_mail('lab_migration', 'proposal_approved', $email_to, language_default(), $param, $from, TRUE))
+            drupal_set_message('Error sending email message.', 'error');
         drupal_set_message('Lab migration proposal No. ' . $proposal_id . ' approved. User has been notified of the approval.', 'status');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    } else if ($form_state['values']['approval'] == 2) {
+      }
+    else if ($form_state['values']['approval'] == 2)
+      {
         $query = "UPDATE {lab_migration_proposal} SET approver_uid = :uid, approval_date = :date, approval_status = 2, message = :message, solution_provider_uid = 0, solution_status = 0 WHERE id = :proposal_id";
         $args = array(
             ":uid" => $user->uid,
@@ -386,34 +418,35 @@ function lab_migration_proposal_approval_form_submit($form, &$form_state)
             ":proposal_id" => $proposal_id
         );
         $result = db_query($query, $args);
-       /* sending email */
-    $user_data = user_load($proposal_data->uid);
-    $email_to = $user_data->mail;
-
-    $from=variable_get('lab_migration_from_email', '');
-    $bcc=$user->mail . ', ' .variable_get('lab_migration_emails', '');
-    $cc=variable_get('lab_migration_cc_emails', '');
-	
-    $param['proposal_disapproved']['proposal_id'] = $proposal_id;
-    $param['proposal_disapproved']['user_id'] = $proposal_data->uid;
-    $param['proposal_disapproved']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
-    			'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
-    			'Content-Transfer-Encoding' => '8Bit',
-    			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
-
-    if (!drupal_mail('lab_migration', 'proposal_disapproved', $email_to , language_default(), $param,$from, TRUE))
-      drupal_set_message('Error sending email message.', 'error');
-        
+        /* sending email */
+        $user_data = user_load($proposal_data->uid);
+        $email_to = $user_data->mail;
+        $from = variable_get('lab_migration_from_email', '');
+        $bcc = $user->mail . ', ' . variable_get('lab_migration_emails', '');
+        $cc = variable_get('lab_migration_cc_emails', '');
+        $param['proposal_disapproved']['proposal_id'] = $proposal_id;
+        $param['proposal_disapproved']['user_id'] = $proposal_data->uid;
+        $param['proposal_disapproved']['headers'] = array(
+            'From' => $from,
+            'MIME-Version' => '1.0',
+            'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+            'Content-Transfer-Encoding' => '8Bit',
+            'X-Mailer' => 'Drupal',
+            'Cc' => $cc,
+            'Bcc' => $bcc
+        );
+        if (!drupal_mail('lab_migration', 'proposal_disapproved', $email_to, language_default(), $param, $from, TRUE))
+            drupal_set_message('Error sending email message.', 'error');
         drupal_set_message('Lab migration proposal No. ' . $proposal_id . ' dis-approved. User has been notified of the dis-approval.', 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
-}
+      }
+  }
 /******************************************************************************/
 /*************************** PROPOSAL STATUS FORM *****************************/
 /******************************************************************************/
 function lab_migration_proposal_status_form($form, $form_state)
-{
+  {
     global $user;
     /* get current proposal */
     $proposal_id = (int) arg(3);
@@ -422,19 +455,25 @@ function lab_migration_proposal_status_form($form, $form_state)
     $query->fields('lab_migration_proposal');
     $query->condition('id', $proposal_id);
     $proposal_q = $query->execute();
-    if ($proposal_q) {
-        if ($proposal_data = $proposal_q->fetchObject()) {
+    if ($proposal_q)
+      {
+        if ($proposal_data = $proposal_q->fetchObject())
+          {
             /* everything ok */
-        } else {
+          }
+        else
+          {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
             drupal_goto('lab-migration/manage-proposal');
             return;
-        }
-    } else {
+          }
+      }
+    else
+      {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
+      }
     $form['name'] = array(
         '#type' => 'item',
         '#markup' => l($proposal_data->name_title . ' ' . $proposal_data->name, 'user/' . $proposal_data->uid),
@@ -473,26 +512,32 @@ function lab_migration_proposal_status_form($form, $form_state)
     $query->condition('proposal_id', $proposal_id);
     $query->orderBy('id', 'ASC');
     $experiment_q = $query->execute();
-    while ($experiment_data = $experiment_q->fetchObject()) {
+    while ($experiment_data = $experiment_q->fetchObject())
+      {
         $experiment_list .= '<li>' . $experiment_data->title . '</li>Description of Experiment : ' . $experiment_data->description . '<br>';
-    }
+      }
     $experiment_list .= '</ul>';
     $form['experiment'] = array(
         '#type' => 'item',
         '#markup' => $experiment_list,
         '#title' => t('Experiments')
     );
-    if ($proposal_data->solution_provider_uid == 0) {
+    if ($proposal_data->solution_provider_uid == 0)
+      {
         $solution_provider = "User will not provide solution, we will have to provide solution";
-    } else if ($proposal_data->solution_provider_uid == $proposal_data->uid) {
+      }
+    else if ($proposal_data->solution_provider_uid == $proposal_data->uid)
+      {
         $solution_provider = "Proposer will provide the solution of the lab";
-    } else {
+      }
+    else
+      {
         $solution_provider_user_data = user_load($proposal_data->solution_provider_uid);
         if ($solution_provider_user_data)
             $solution_provider = "Solution will be provided by user " . l($solution_provider_user_data->name, 'user/' . $proposal_data->solution_provider_uid);
         else
             $solution_provider = "User does not exists";
-    }
+      }
     $form['solution_provider_uid'] = array(
         '#type' => 'item',
         '#title' => t('Who will provide the solution'),
@@ -504,7 +549,8 @@ function lab_migration_proposal_status_form($form, $form_state)
     '#markup' => ($proposal_data->solution_display == 1) ? "Yes" : "No",
     );*/
     $proposal_status = '';
-    switch ($proposal_data->approval_status) {
+    switch ($proposal_data->approval_status)
+    {
         case 0:
             $proposal_status = t('Pending');
             break;
@@ -526,27 +572,30 @@ function lab_migration_proposal_status_form($form, $form_state)
         '#markup' => $proposal_status,
         '#title' => t('Proposal Status')
     );
-    if ($proposal_data->approval_status == 0) {
+    if ($proposal_data->approval_status == 0)
+      {
         $form['approve'] = array(
             '#type' => 'item',
             '#markup' => l('Click here', 'lab-migration/manage-proposal/approve/' . $proposal_id),
             '#title' => t('Approve')
         );
-    }
-    if ($proposal_data->approval_status == 1) {
+      }
+    if ($proposal_data->approval_status == 1)
+      {
         $form['completed'] = array(
             '#type' => 'checkbox',
             '#title' => t('Completed'),
             '#description' => t('Check if user has provided all experiment solutions.')
         );
-    }
-    if ($proposal_data->approval_status == 2) {
+      }
+    if ($proposal_data->approval_status == 2)
+      {
         $form['message'] = array(
             '#type' => 'item',
             '#markup' => $proposal_data->message,
             '#title' => t('Reason for disapproval')
         );
-    }
+      }
     $form['submit'] = array(
         '#type' => 'submit',
         '#value' => t('Submit')
@@ -556,9 +605,9 @@ function lab_migration_proposal_status_form($form, $form_state)
         '#markup' => l(t('Cancel'), 'lab-migration/manage-proposal/all')
     );
     return $form;
-}
+  }
 function lab_migration_proposal_status_form_submit($form, &$form_state)
-{
+  {
     global $user;
     /* get current proposal */
     $proposal_id = (int) arg(3);
@@ -567,21 +616,28 @@ function lab_migration_proposal_status_form_submit($form, &$form_state)
     $query->fields('lab_migration_proposal');
     $query->condition('id', $proposal_id);
     $proposal_q = $query->execute();
-    if ($proposal_q) {
-        if ($proposal_data = $proposal_q->fetchObject()) {
+    if ($proposal_q)
+      {
+        if ($proposal_data = $proposal_q->fetchObject())
+          {
             /* everything ok */
-        } else {
+          }
+        else
+          {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
             drupal_goto('lab-migration/manage-proposal');
             return;
-        }
-    } else {
+          }
+      }
+    else
+      {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
+      }
     /* set the book status to completed */
-    if ($form_state['values']['completed'] == 1) {
+    if ($form_state['values']['completed'] == 1)
+      {
         $up_query = "UPDATE lab_migration_proposal SET approval_status = :approval_status , expected_completion_date = :expected_completion_date WHERE id = :proposal_id";
         $args = array(
             ":approval_status" => '3',
@@ -590,42 +646,43 @@ function lab_migration_proposal_status_form_submit($form, &$form_state)
         );
         $result = db_query($up_query, $args);
         CreateReadmeFileLabMigration($proposal_id);
-        if (!$result) {
+        if (!$result)
+          {
             drupal_set_message('Error in update status', 'error');
             return;
-        }
-      /* sending email */
-    $user_data = user_load($proposal_data->uid);
-    $email_to = $user_data->mail;
-
-    $from=variable_get('lab_migration_from_email', '');
-    $bcc=$user->mail . ', ' .variable_get('lab_migration_emails', '');
-    $cc=variable_get('lab_migration_cc_emails', '');
-
-    $param['proposal_completed']['proposal_id'] = $proposal_id;
-    $param['proposal_completed']['user_id'] = $proposal_data->uid;
-    $param['proposal_completed']['headers']=array('From'=>$from,'MIME-Version'=> '1.0',
-    			'Content-Type'=> 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
-    			'Content-Transfer-Encoding' => '8Bit',
-    			'X-Mailer'=> 'Drupal','Cc' => $cc, 'Bcc' => $bcc);
-
-    if (!drupal_mail('lab_migration', 'proposal_completed', $email_to , language_default(), $param, $from, TRUE))
-      drupal_set_message('Error sending email message.', 'error');
-
-    /*$email_to = $user->mail . ', ' . variable_get('lab_migration_emails', '');;
-    if (!drupal_mail('lab_migration', 'proposal_completed', $email_to , language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE))
-      drupal_set_message('Error sending email message.', 'error');*/
- 
-    drupal_set_message('Congratulations! Lab Migration proposal has been marked as completed. User has been notified of the completion.', 'status');
+          }
+        /* sending email */
+        $user_data = user_load($proposal_data->uid);
+        $email_to = $user_data->mail;
+        $from = variable_get('lab_migration_from_email', '');
+        $bcc = $user->mail . ', ' . variable_get('lab_migration_emails', '');
+        $cc = variable_get('lab_migration_cc_emails', '');
+        $param['proposal_completed']['proposal_id'] = $proposal_id;
+        $param['proposal_completed']['user_id'] = $proposal_data->uid;
+        $param['proposal_completed']['headers'] = array(
+            'From' => $from,
+            'MIME-Version' => '1.0',
+            'Content-Type' => 'text/plain; charset=UTF-8; format=flowed; delsp=yes',
+            'Content-Transfer-Encoding' => '8Bit',
+            'X-Mailer' => 'Drupal',
+            'Cc' => $cc,
+            'Bcc' => $bcc
+        );
+        if (!drupal_mail('lab_migration', 'proposal_completed', $email_to, language_default(), $param, $from, TRUE))
+            drupal_set_message('Error sending email message.', 'error');
+        /*$email_to = $user->mail . ', ' . variable_get('lab_migration_emails', '');;
+        if (!drupal_mail('lab_migration', 'proposal_completed', $email_to , language_default(), $param, variable_get('lab_migration_from_email', NULL), TRUE))
+        drupal_set_message('Error sending email message.', 'error');*/
+        drupal_set_message('Congratulations! Lab Migration proposal has been marked as completed. User has been notified of the completion.', 'status');
+      }
+    drupal_goto('lab-migration/manage-proposal');
+    return;
   }
-  drupal_goto('lab-migration/manage-proposal');
-  return;
-}
 /******************************************************************************/
 /**************************** PROPOSAL EDIT FORM ******************************/
 /******************************************************************************/
 function lab_migration_proposal_edit_form($form, $form_state)
-{
+  {
     global $user;
     /* get current proposal */
     $proposal_id = (int) arg(3);
@@ -634,19 +691,25 @@ function lab_migration_proposal_edit_form($form, $form_state)
     $query->fields('lab_migration_proposal');
     $query->condition('id', $proposal_id);
     $proposal_q = $query->execute();
-    if ($proposal_q) {
-        if ($proposal_data = $proposal_q->fetchObject()) {
+    if ($proposal_q)
+      {
+        if ($proposal_data = $proposal_q->fetchObject())
+          {
             /* everything ok */
-        } else {
+          }
+        else
+          {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
             drupal_goto('lab-migration/manage-proposal');
             return;
-        }
-    } else {
+          }
+      }
+    else
+      {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
+      }
     $user_data = user_load($proposal_data->uid);
     $form['name_title'] = array(
         '#type' => 'select',
@@ -814,10 +877,12 @@ function lab_migration_proposal_edit_form($form, $form_state)
     '#collapsible' => FALSE,
     '#tree' => TRUE,
     );*/
-    for ($counter = 1; $counter <= 15; $counter++) {
+    for ($counter = 1; $counter <= 15; $counter++)
+      {
         $experiment_title = '';
         $experiment_data = $experiment_q->fetchObject();
-        if ($experiment_data) {
+        if ($experiment_data)
+          {
             $experiment_title = $experiment_data->title;
             $experiment_description = $experiment_data->description;
             /*$form['lab_experiment_']['update'][$experiment_data->id] = array(
@@ -849,7 +914,9 @@ function lab_migration_proposal_edit_form($form, $form_state)
                 '#default_value' => $experiment_description,
                 '#title' => t('Description for Experiment ') . $counter
             );
-        } else {
+          }
+        else
+          {
             $form['lab_experiment_insert' . $counter] = array(
                 '#type' => 'textfield',
                 '#title' => t('Title of the Experiment ') . $counter,
@@ -872,20 +939,26 @@ function lab_migration_proposal_edit_form($form, $form_state)
                     )
                 )
             );
-        }
-    }
-    if ($proposal_data->solution_provider_uid == 0) {
+          }
+      }
+    if ($proposal_data->solution_provider_uid == 0)
+      {
         $solution_provider_user = 'Open';
-    } else if ($proposal_data->solution_provider_uid == $proposal_data->uid) {
+      }
+    else if ($proposal_data->solution_provider_uid == $proposal_data->uid)
+      {
         $solution_provider_user = 'Proposer';
-    } else {
+      }
+    else
+      {
         $user_data = user_load($proposal_data->solution_provider_uid);
-        if (!$user_data) {
+        if (!$user_data)
+          {
             $solution_provider_user = 1;
             drupal_set_message('Solution provider user name is invalid', 'error');
-        }
+          }
         $solution_provider_user = $user_data->name;
-    }
+      }
     $form['solution_provider_uid'] = array(
         '#type' => 'item',
         '#title' => t('Who will provide the solution'),
@@ -918,32 +991,35 @@ function lab_migration_proposal_edit_form($form, $form_state)
         '#markup' => l(t('Cancel'), 'lab-migration/manage-proposal')
     );
     return $form;
-}
+  }
 function lab_migration_proposal_edit_form_validate($form, &$form_state)
-{
+  {
     $proposal_id = (int) arg(3);
     /* check before delete proposal */
-    if ($form_state['values']['delete_proposal'] == 1) {
+    if ($form_state['values']['delete_proposal'] == 1)
+      {
         //$experiment_q = db_query("SELECT * FROM {lab_migration_experiment} WHERE proposal_id = %d", $proposal_id);
         $query = db_select('lab_migration_experiment');
         $query->fields('lab_migration_experiment');
         $query->condition('proposal_id', $proposal_id);
         $experiment_q = $query->execute();
-        while ($experiment_data = $experiment_q->fetchObject()) {
+        while ($experiment_data = $experiment_q->fetchObject())
+          {
             //$solution_q = db_query("SELECT * FROM {lab_migration_solution} WHERE experiment_id = %d", $experiment_data->id);
             $query = db_select('lab_migration_solution');
             $query->fields('lab_migration_solution');
             $query->condition('experiment_id', $experiment_data->id);
             $solution_q = $query->execute();
-            if ($solution_q->fetchObject()) {
+            if ($solution_q->fetchObject())
+              {
                 form_set_error('', t('Cannot delete proposal since there are solutions already uploaded. Use the "Bulk Manage" interface to delete this proposal'));
-            }
-        }
-    }
+              }
+          }
+      }
     return;
-}
+  }
 function lab_migration_proposal_edit_form_submit($form, &$form_state)
-{
+  {
     global $user;
     /* get current proposal */
     $proposal_id = (int) arg(3);
@@ -952,21 +1028,28 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
     $query->fields('lab_migration_proposal');
     $query->condition('id', $proposal_id);
     $proposal_q = $query->execute();
-    if ($proposal_q) {
-        if ($proposal_data = $proposal_q->fetchObject()) {
+    if ($proposal_q)
+      {
+        if ($proposal_data = $proposal_q->fetchObject())
+          {
             /* everything ok */
-        } else {
+          }
+        else
+          {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
             drupal_goto('lab-migration/manage-proposal');
             return;
-        }
-    } else {
+          }
+      }
+    else
+      {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
+      }
     /* delete proposal */
-    if ($form_state['values']['delete_proposal'] == 1) {
+    if ($form_state['values']['delete_proposal'] == 1)
+      {
         //db_query("DELETE FROM {lab_migration_proposal} WHERE id = %d", $proposal_id);
         $query = db_delete('lab_migration_proposal');
         $query->condition('id', $proposal_id);
@@ -978,8 +1061,9 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
         drupal_set_message(t('Proposal Delete'), 'status');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
-    if ($form_state['values']['open_solution'] == 1) {
+      }
+    if ($form_state['values']['open_solution'] == 1)
+      {
         // $query = "UPDATE {lab_migration_proposal} SET solution_provider_uid = :solution_provider_uid, solution_status = :solution_status, solution_provider_name_title = '', solution_provider_name = '', solution_provider_contact_ph = '', solution_provider_department = '', solution_provider_university = '' WHERE id = :proposal_id";
         // $args= array(
         //    ":solution_provider_uid" => 0, 
@@ -996,17 +1080,21 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
             'solution_provider_department' => '',
             'solution_provider_university' => ''
         ))->condition('id', $proposal_id)->execute();
-        if (!$result) {
+        if (!$result)
+          {
             drupal_set_message(t('Solution already open for everyone.'), 'error');
             return;
-        }
-    }
+          }
+      }
     $solution_display = 0;
-    if ($form_state['values']['solution_display'] == 1) {
+    if ($form_state['values']['solution_display'] == 1)
+      {
         $solution_display = 1;
-    } else {
+      }
+    else
+      {
         $solution_display = 0;
-    }
+      }
     /* update proposal */
     $v = $form_state['values'];
     //$query = "UPDATE {lab_migration_proposal} SET name_title = :name_title, name = :name, contact_ph = :contact_ph, department = :department, university = :unversity, lab_title = :lab_title, solution_display = :solution_display WHERE id = :id";
@@ -1040,12 +1128,15 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
     $query->condition('proposal_id', $proposal_id);
     $query->orderBy('id', 'ASC');
     $experiment_q = $query->execute();
-    for ($counter = 1; $counter <= 15; $counter++) {
+    for ($counter = 1; $counter <= 15; $counter++)
+      {
         $experiment_data = $experiment_q->fetchObject();
-        if ($experiment_data) {
+        if ($experiment_data)
+          {
             $experiment_field_name = 'lab_experiment_update' . $experiment_data->id;
             $experiment_description = 'lab_experiment_description_update' . $experiment_data->id;
-            if (strlen(trim($form_state['values'][$experiment_field_name])) >= 1) {
+            if (strlen(trim($form_state['values'][$experiment_field_name])) >= 1)
+              {
                 $query = "UPDATE {lab_migration_experiment} SET title = :title, description= :description WHERE id = :id";
                 $args = array(
                     ":title" => trim($form_state['values'][$experiment_field_name]),
@@ -1053,18 +1144,21 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
                     ":id" => $experiment_data->id
                 );
                 $result2 = db_query($query, $args);
-                if (!$result2) {
+                if (!$result2)
+                  {
                     drupal_set_message(t('Could not update Title of the Experiment : ') . trim($form_state['values'][$experiment_field_name]), 'error');
-                }
-            } else {
+                  }
+              }
+            else
+              {
                 $query = "DELETE FROM {lab_migration_experiment} WHERE id = :id LIMIT 1";
                 $args = array(
                     ":id" => $experiment_data->id
                 );
                 $result3 = db_query($query, $args);
-            }
-        }
-    }
+              }
+          }
+      }
     /* foreach ($form_state['values']['lab_experiment']['update'] as $update_id => $update_value) {
     if (strlen(trim($update_value)) >= 1) {
     $description= $form_state['values']['lab_experiment_description']['update']; 
@@ -1094,16 +1188,21 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
     $query->orderBy('number', 'DESC');
     $query->range(0, 1);
     $number_q = $query->execute();
-    if ($number_data = $number_q->fetchObject()) {
+    if ($number_data = $number_q->fetchObject())
+      {
         $number = (int) $number_data->number;
         $number++;
-    } else {
+      }
+    else
+      {
         $number = 1;
-    }
-    for ($counter = 1; $counter <= 15; $counter++) {
+      }
+    for ($counter = 1; $counter <= 15; $counter++)
+      {
         $lab_experiment_insert = 'lab_experiment_insert' . $counter;
         $lab_experiment_description_insert = 'lab_experiment_description_insert' . $counter;
-        if (strlen(trim(isset($form_state['values'][$lab_experiment_insert]))) >= 1) {
+        if (strlen(trim(isset($form_state['values'][$lab_experiment_insert]))) >= 1)
+          {
             $query = "INSERT INTO {lab_migration_experiment} (proposal_id, number, title, description) VALUES (:proposal_id, :number, :title, :description)";
             $args = array(
                 ":proposal_id" => $proposal_id,
@@ -1112,13 +1211,16 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
                 ":description" => trim($form_state['values'][$lab_experiment_description_insert])
             );
             $result4 = db_query($query, $args);
-            if (!$result4) {
+            if (!$result4)
+              {
                 drupal_set_message(t('Could not insert Title of the Experiment : ') . trim($form_state['values'][$lab_experiment_insert]), 'error');
-            } else {
+              }
+            else
+              {
                 $number++;
-            }
-        }
-    }
+              }
+          }
+      }
     /* $query = db_select('lab_migration_experiment');
     $query->fields('lab_migration_experiment');
     $query->condition('proposal_id', $proposal_id);
@@ -1157,12 +1259,12 @@ function lab_migration_proposal_edit_form_submit($form, &$form_state)
     }
     }*/
     drupal_set_message(t('Proposal Updated'), 'status');
-}
+  }
 /******************************************************************************/
 /**************************** CATEGORY EDIT FORM ******************************/
 /******************************************************************************/
 function lab_migration_category_edit_form($form, $form_state)
-{
+  {
     /* get current proposal */
     $proposal_id = (int) arg(4);
     //$proposal_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE id = %d", $proposal_id);
@@ -1170,19 +1272,25 @@ function lab_migration_category_edit_form($form, $form_state)
     $query->fields('lab_migration_proposal');
     $query->condition('id', $proposal_id);
     $proposal_q = $query->execute();
-    if ($proposal_q) {
-        if ($proposal_data = $proposal_q->fetchObject()) {
+    if ($proposal_q)
+      {
+        if ($proposal_data = $proposal_q->fetchObject())
+          {
             /* everything ok */
-        } else {
+          }
+        else
+          {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
             drupal_goto('lab-migration/manage-proposal');
             return;
-        }
-    } else {
+          }
+      }
+    else
+      {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
+      }
     $form['name'] = array(
         '#type' => 'item',
         '#markup' => l($proposal_data->name_title . ' ' . $proposal_data->name, 'user/' . $proposal_data->uid),
@@ -1229,9 +1337,9 @@ function lab_migration_category_edit_form($form, $form_state)
         '#markup' => l(t('Cancel'), 'lab-migration/manage-proposal/category')
     );
     return $form;
-}
+  }
 function lab_migration_category_edit_form_submit($form, &$form_state)
-{
+  {
     /* get current proposal */
     $proposal_id = (int) arg(4);
     //$proposal_q = db_query("SELECT * FROM {lab_migration_proposal} WHERE id = %d", $proposal_id);
@@ -1239,19 +1347,25 @@ function lab_migration_category_edit_form_submit($form, &$form_state)
     $query->fields('lab_migration_proposal');
     $query->condition('id', $proposal_id);
     $proposal_q = $query->execute();
-    if ($proposal_q) {
-        if ($proposal_data = $proposal_q->fetchObject()) {
+    if ($proposal_q)
+      {
+        if ($proposal_data = $proposal_q->fetchObject())
+          {
             /* everything ok */
-        } else {
+          }
+        else
+          {
             drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
             drupal_goto('lab-migration/manage-proposal');
             return;
-        }
-    } else {
+          }
+      }
+    else
+      {
         drupal_set_message(t('Invalid proposal selected. Please try again.'), 'error');
         drupal_goto('lab-migration/manage-proposal');
         return;
-    }
+      }
     $query = "UPDATE {lab_migration_proposal} SET category = :category WHERE id = :proposal_id";
     $args = array(
         ":category" => $form_state['values']['category'],
@@ -1260,9 +1374,9 @@ function lab_migration_category_edit_form_submit($form, &$form_state)
     $result = db_query($query, $args);
     drupal_set_message(t('Proposal Category Updated'), 'status');
     drupal_goto('lab-migration/manage-proposal/category');
-}
+  }
 function _lm_list_of_departments()
-{
+  {
     $department = array(
         0 => '-Select-'
     );
@@ -1270,13 +1384,14 @@ function _lm_list_of_departments()
     $query->fields('list_of_departments');
     $query->orderBy('id', 'DESC');
     $department_list = $query->execute();
-    while ($department_list_data = $department_list->fetchObject()) {
+    while ($department_list_data = $department_list->fetchObject())
+      {
         $department[$department_list_data->department] = $department_list_data->department;
-    }
+      }
     return $department;
-}
+  }
 function _lm_list_of_states()
-{
+  {
     $states = array(
         0 => '-Select-'
     );
@@ -1284,25 +1399,27 @@ function _lm_list_of_states()
     $query->fields('list_states_of_india');
     //$query->orderBy('', '');
     $states_list = $query->execute();
-    while ($states_list_data = $states_list->fetchObject()) {
+    while ($states_list_data = $states_list->fetchObject())
+      {
         $states[$states_list_data->state] = $states_list_data->state;
-    }
+      }
     return $states;
-}
+  }
 function _lm_list_of_cities()
-{
+  {
     $city = array();
     $query = db_select('list_cities_of_india');
     $query->fields('list_cities_of_india');
     $query->orderBy('city', 'ASC');
     $city_list = $query->execute();
-    while ($city_list_data = $city_list->fetchObject()) {
+    while ($city_list_data = $city_list->fetchObject())
+      {
         $city[$city_list_data->city] = $city_list_data->city;
-    }
+      }
     return $city;
-}
+  }
 function CreateReadmeFileLabMigration($proposal_id)
-{
+  {
     $result = db_query("
                         SELECT * from lab_migration_proposal WHERE id = :proposal_id", array(
         ":proposal_id" => $proposal_id
@@ -1328,4 +1445,4 @@ function CreateReadmeFileLabMigration($proposal_id)
     fwrite($readme_file, $txt);
     fclose($readme_file);
     return $txt;
-}
+  }